Puts everywhere brackets
This commit is contained in:
@@ -97,14 +97,17 @@ public class CachedPlane
|
||||
}
|
||||
|
||||
for( int x = 0; x < this.x_size; x++ )
|
||||
{
|
||||
for( int z = 0; z < this.z_size; z++ )
|
||||
{
|
||||
this.myColumns[x][z] = new Column( w.getChunkFromChunkCoords( ( minX + x ) >> 4, ( minZ + z ) >> 4 ), ( minX + x ) & 0xF, ( minZ + z ) & 0xF, minCY, cy_size );
|
||||
}
|
||||
}
|
||||
|
||||
IMovableRegistry mr = AEApi.instance().registries().movable();
|
||||
|
||||
for( int cx = 0; cx < this.cx_size; cx++ )
|
||||
{
|
||||
for( int cz = 0; cz < this.cz_size; cz++ )
|
||||
{
|
||||
LinkedList<Entry<ChunkPosition, TileEntity>> rawTiles = new LinkedList<Entry<ChunkPosition, TileEntity>>();
|
||||
@@ -137,7 +140,9 @@ public class CachedPlane
|
||||
c.worldObj.notifyBlocksOfNeighborChange( te.xCoord, te.yCoord, te.zCoord, Platform.AIR );
|
||||
}
|
||||
else
|
||||
{
|
||||
this.myColumns[te.xCoord - minX][te.zCoord - minZ].setSkip( te.yCoord );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -163,6 +168,7 @@ public class CachedPlane
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for( TileEntity te : this.tiles )
|
||||
{
|
||||
@@ -260,7 +266,9 @@ public class CachedPlane
|
||||
{
|
||||
this.updates.add( new WorldCoord( src_x, src_y, src_z ) );
|
||||
for( ForgeDirection d : ForgeDirection.VALID_DIRECTIONS )
|
||||
{
|
||||
this.updates.add( new WorldCoord( src_x + d.offsetX, src_y + d.offsetY, src_z + d.offsetZ ) );
|
||||
}
|
||||
}
|
||||
|
||||
private void addTick( int x, int y, int z, NextTickListEntry entry )
|
||||
@@ -320,6 +328,7 @@ public class CachedPlane
|
||||
|
||||
// update shit..
|
||||
for( int x = 0; x < this.cx_size; x++ )
|
||||
{
|
||||
for( int z = 0; z < this.cz_size; z++ )
|
||||
{
|
||||
Chunk c = this.myChunks[x][z];
|
||||
@@ -327,19 +336,24 @@ public class CachedPlane
|
||||
c.generateSkylightMap();
|
||||
c.isModified = true;
|
||||
}
|
||||
}
|
||||
|
||||
// send shit...
|
||||
for( int x = 0; x < this.cx_size; x++ )
|
||||
{
|
||||
for( int z = 0; z < this.cz_size; z++ )
|
||||
{
|
||||
|
||||
Chunk c = this.myChunks[x][z];
|
||||
|
||||
for( int y = 1; y < 255; y += 32 )
|
||||
{
|
||||
WorldSettings.getInstance().getCompass().updateArea( this.world, c.xPosition << 4, y, c.zPosition << 4 );
|
||||
}
|
||||
|
||||
Platform.sendChunk( c, this.verticalBits );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Column
|
||||
@@ -365,7 +379,9 @@ public class CachedPlane
|
||||
int by = ( ay + cy );
|
||||
ExtendedBlockStorage extendedblockstorage = this.storage[by];
|
||||
if( extendedblockstorage == null )
|
||||
{
|
||||
extendedblockstorage = this.storage[by] = new ExtendedBlockStorage( by << 4, !this.c.worldObj.provider.hasNoSky );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -399,7 +415,9 @@ public class CachedPlane
|
||||
{
|
||||
ExtendedBlockStorage extendedblockstorage = this.storage[y >> 4];
|
||||
if( CachedPlane.this.reg.isBlacklisted( extendedblockstorage.getBlockByExtId( this.x, y & 15, this.z ) ) )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return this.skipThese == null || !this.skipThese.contains( y );
|
||||
}
|
||||
@@ -407,7 +425,9 @@ public class CachedPlane
|
||||
public void setSkip( int yCoord )
|
||||
{
|
||||
if( this.skipThese == null )
|
||||
{
|
||||
this.skipThese = new LinkedList<Integer>();
|
||||
}
|
||||
this.skipThese.add( yCoord );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +68,9 @@ public class StorageChunkProvider extends ChunkProviderGenerate
|
||||
AEConfig config = AEConfig.instance;
|
||||
|
||||
for( int k = 0; k < biomes.length; ++k )
|
||||
{
|
||||
biomes[k] = (byte) config.storageBiomeID;
|
||||
}
|
||||
|
||||
if( !chunk.isTerrainPopulated )
|
||||
{
|
||||
|
||||
@@ -48,7 +48,9 @@ public class StorageHelper
|
||||
public static StorageHelper getInstance()
|
||||
{
|
||||
if( instance == null )
|
||||
{
|
||||
instance = new StorageHelper();
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
@@ -78,9 +80,13 @@ public class StorageHelper
|
||||
}
|
||||
|
||||
if( oldWorld == null )
|
||||
{
|
||||
return entity;
|
||||
}
|
||||
if( newWorld == null )
|
||||
{
|
||||
return entity;
|
||||
}
|
||||
|
||||
// Is something riding? Handle it first.
|
||||
if( entity.riddenByEntity != null )
|
||||
@@ -105,7 +111,9 @@ public class StorageHelper
|
||||
if( player != null )
|
||||
{
|
||||
if( link.dim.provider instanceof StorageWorldProvider )
|
||||
{
|
||||
Achievements.SpatialIOExplorer.addToPlayer( player );
|
||||
}
|
||||
|
||||
player.mcServer.getConfigurationManager().transferPlayerToDimension( player, link.dim.provider.dimensionId, new METeleporter( newWorld, link ) );
|
||||
}
|
||||
@@ -143,7 +151,9 @@ public class StorageHelper
|
||||
entity = newEntity;
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
// myChunk.addEntity( entity );
|
||||
// newWorld.loadedEntityList.add( entity );
|
||||
@@ -157,7 +167,9 @@ public class StorageHelper
|
||||
if( cart != null )
|
||||
{
|
||||
if( player != null )
|
||||
{
|
||||
entity.worldObj.updateEntityWithOptionalForce( entity, true );
|
||||
}
|
||||
|
||||
entity.mountEntity( cart );
|
||||
}
|
||||
@@ -168,25 +180,31 @@ public class StorageHelper
|
||||
public void transverseEdges( int minX, int minY, int minZ, int maxX, int maxY, int maxZ, ISpatialVisitor visitor )
|
||||
{
|
||||
for( int y = minY; y < maxY; y++ )
|
||||
{
|
||||
for( int z = minZ; z < maxZ; z++ )
|
||||
{
|
||||
visitor.visit( minX, y, z );
|
||||
visitor.visit( maxX, y, z );
|
||||
}
|
||||
}
|
||||
|
||||
for( int x = minX; x < maxX; x++ )
|
||||
{
|
||||
for( int z = minZ; z < maxZ; z++ )
|
||||
{
|
||||
visitor.visit( x, minY, z );
|
||||
visitor.visit( x, maxY, z );
|
||||
}
|
||||
}
|
||||
|
||||
for( int x = minX; x < maxX; x++ )
|
||||
{
|
||||
for( int y = minY; y < maxY; y++ )
|
||||
{
|
||||
visitor.visit( x, y, minZ );
|
||||
visitor.visit( x, y, maxZ );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void swapRegions( World src /** over world **/, World dst /** storage cell **/, int x, int y, int z, int i, int j, int k, int scaleX, int scaleY, int scaleZ )
|
||||
@@ -220,10 +238,14 @@ public class StorageHelper
|
||||
}
|
||||
|
||||
for( WorldCoord wc : cDst.updates )
|
||||
{
|
||||
cDst.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR );
|
||||
}
|
||||
|
||||
for( WorldCoord wc : cSrc.updates )
|
||||
{
|
||||
cSrc.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR );
|
||||
}
|
||||
|
||||
this.transverseEdges( x - 1, y - 1, z - 1, x + scaleX + 1, y + scaleY + 1, z + scaleZ + 1, new TriggerUpdates( src ) );
|
||||
this.transverseEdges( i - 1, j - 1, k - 1, i + scaleX + 1, j + scaleY + 1, k + scaleZ + 1, new TriggerUpdates( dst ) );
|
||||
|
||||
Reference in New Issue
Block a user