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

final variables and parameters

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:24:40 +02:00
parent 059523f543
commit 8b3a954f73
732 changed files with 9253 additions and 9256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/worldgen/MeteoritePlacer.java
+62 -62
View File
@@ -93,7 +93,7 @@ public final class MeteoritePlacer
this.validSpawn.add( Blocks.snow );
this.validSpawn.add( Blocks.stained_hardened_clay );
for( Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() )
for( final Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() )
{
this.invalidSpawn.add( skyStoneBlock );
}
@@ -116,20 +116,20 @@ public final class MeteoritePlacer
this.type = new Fallout( this.putter, this.skyStoneDefinition );
}
public boolean spawnMeteorite( IMeteoriteWorld w, NBTTagCompound meteoriteBlob )
public boolean spawnMeteorite( final IMeteoriteWorld w, final NBTTagCompound meteoriteBlob )
{
this.settings = meteoriteBlob;
int x = this.settings.getInteger( "x" );
int y = this.settings.getInteger( "y" );
int z = this.settings.getInteger( "z" );
final int x = this.settings.getInteger( "x" );
final int y = this.settings.getInteger( "y" );
final int z = this.settings.getInteger( "z" );
this.meteoriteSize = this.settings.getDouble( "real_sizeOfMeteorite" );
this.realCrater = this.settings.getDouble( "realCrater" );
this.squaredMeteoriteSize = this.settings.getDouble( "sizeOfMeteorite" );
this.crater = this.settings.getDouble( "crater" );
Block blk = Block.getBlockById( this.settings.getInteger( "blk" ) );
final Block blk = Block.getBlockById( this.settings.getInteger( "blk" ) );
if( blk == Blocks.sand )
{
@@ -144,7 +144,7 @@ public final class MeteoritePlacer
this.type = new FalloutSnow( w, x, y, z, this.putter, this.skyStoneDefinition );
}
int skyMode = this.settings.getInteger( "skyMode" );
final int skyMode = this.settings.getInteger( "skyMode" );
// creator
if( skyMode > 10 )
@@ -164,15 +164,15 @@ public final class MeteoritePlacer
return true;
}
private void placeCrater( IMeteoriteWorld w, int x, int y, int z )
private void placeCrater( final IMeteoriteWorld w, final int x, final int y, final int z )
{
boolean lava = this.settings.getBoolean( "lava" );
final boolean lava = this.settings.getBoolean( "lava" );
int maxY = 255;
int minX = w.minX( x - 200 );
int maxX = w.maxX( x + 200 );
int minZ = w.minZ( z - 200 );
int maxZ = w.maxZ( z + 200 );
final int maxY = 255;
final int minX = w.minX( x - 200 );
final int maxX = w.maxX( x + 200 );
final int minZ = w.minZ( z - 200 );
final int maxZ = w.maxZ( z + 200 );
for( int j = y - 5; j < maxY; j++ )
{
@@ -182,11 +182,11 @@ public final class MeteoritePlacer
{
for( int k = minZ; k < maxZ; k++ )
{
double dx = i - x;
double dz = k - z;
double h = y - this.meteoriteSize + 1 + this.type.adjustCrater();
final double dx = i - x;
final double dz = k - z;
final double h = y - this.meteoriteSize + 1 + this.type.adjustCrater();
double distanceFrom = dx * dx + dz * dz;
final double distanceFrom = dx * dx + dz * dz;
if( j > h + distanceFrom * 0.02 )
{
@@ -206,19 +206,19 @@ public final class MeteoritePlacer
}
}
for( Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, AxisAlignedBB.fromBounds( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) )
for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, AxisAlignedBB.fromBounds( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) )
{
Entity e = (Entity) o;
final Entity e = (Entity) o;
e.setDead();
}
}
private void placeMeteorite( IMeteoriteWorld w, int x, int y, int z )
private void placeMeteorite( final IMeteoriteWorld w, final int x, final int y, final int z )
{
int meteorXLength = w.minX( x - 8 );
int meteorXHeight = w.maxX( x + 8 );
int meteorZLength = w.minZ( z - 8 );
int meteorZHeight = w.maxZ( z + 8 );
final int meteorXLength = w.minX( x - 8 );
final int meteorXHeight = w.maxX( x + 8 );
final int meteorZLength = w.minZ( z - 8 );
final int meteorZHeight = w.maxZ( z + 8 );
// spawn meteor
for( int i = meteorXLength; i < meteorXHeight; i++ )
@@ -227,13 +227,13 @@ public final class MeteoritePlacer
{
for( int k = meteorZLength; k < meteorZHeight; k++ )
{
double dx = i - x;
double dy = j - y;
double dz = k - z;
final double dx = i - x;
final double dy = j - y;
final double dz = k - z;
if( dx * dx * 0.7 + dy * dy * ( j > y ? 1.4 : 0.8 ) + dz * dz * 0.7 < this.squaredMeteoriteSize )
{
for( Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() )
for( final Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() )
{
this.putter.put( w, i, j, k, skyStoneBlock );
}
@@ -244,15 +244,15 @@ public final class MeteoritePlacer
if( AEConfig.instance.isFeatureEnabled( AEFeature.SpawnPressesInMeteorites ) )
{
for( Block skyChestBlock : this.skyChestDefinition.maybeBlock().asSet() )
for( final Block skyChestBlock : this.skyChestDefinition.maybeBlock().asSet() )
{
this.putter.put( w, x, y, z, skyChestBlock );
}
TileEntity te = w.getTileEntity( x, y, z );
final TileEntity te = w.getTileEntity( x, y, z );
if( te instanceof IInventory )
{
InventoryAdaptor ap = InventoryAdaptor.getAdaptor( te, EnumFacing.UP );
final InventoryAdaptor ap = InventoryAdaptor.getAdaptor( te, EnumFacing.UP );
int primary = Math.max( 1, (int) ( Math.random() * 4 ) );
@@ -285,25 +285,25 @@ public final class MeteoritePlacer
switch( r % 4 )
{
case 0:
for( ItemStack calc : materials.calcProcessorPress().maybeStack( 1 ).asSet() )
for( final ItemStack calc : materials.calcProcessorPress().maybeStack( 1 ).asSet() )
{
toAdd = calc;
}
break;
case 1:
for( ItemStack calc : materials.engProcessorPress().maybeStack( 1 ).asSet() )
for( final ItemStack calc : materials.engProcessorPress().maybeStack( 1 ).asSet() )
{
toAdd = calc;
}
break;
case 2:
for( ItemStack calc : materials.logicProcessorPress().maybeStack( 1 ).asSet() )
for( final ItemStack calc : materials.logicProcessorPress().maybeStack( 1 ).asSet() )
{
toAdd = calc;
}
break;
case 3:
for( ItemStack calc : materials.siliconPress().maybeStack( 1 ).asSet() )
for( final ItemStack calc : materials.siliconPress().maybeStack( 1 ).asSet() )
{
toAdd = calc;
}
@@ -326,20 +326,20 @@ public final class MeteoritePlacer
while( duplicate );
}
int secondary = Math.max( 1, (int) ( Math.random() * 3 ) );
final int secondary = Math.max( 1, (int) ( Math.random() * 3 ) );
for( int zz = 0; zz < secondary; zz++ )
{
switch( (int) ( Math.random() * 1000 ) % 3 )
{
case 0:
final int amount = (int) ( ( Math.random() * SKYSTONE_SPAWN_LIMIT ) + 1 );
for( ItemStack skyStoneStack : this.skyStoneDefinition.maybeStack( amount ).asSet() )
for( final ItemStack skyStoneStack : this.skyStoneDefinition.maybeStack( amount ).asSet() )
{
ap.addItems( skyStoneStack );
}
break;
case 1:
List<ItemStack> possibles = new LinkedList<ItemStack>();
final List<ItemStack> possibles = new LinkedList<ItemStack>();
possibles.addAll( OreDictionary.getOres( "nuggetIron" ) );
possibles.addAll( OreDictionary.getOres( "nuggetCopper" ) );
possibles.addAll( OreDictionary.getOres( "nuggetTin" ) );
@@ -365,14 +365,14 @@ public final class MeteoritePlacer
}
}
private void decay( IMeteoriteWorld w, int x, int y, int z )
private void decay( final IMeteoriteWorld w, final int x, final int y, final int z )
{
double randomShit = 0;
int meteorXLength = w.minX( x - 30 );
int meteorXHeight = w.maxX( x + 30 );
int meteorZLength = w.minZ( z - 30 );
int meteorZHeight = w.maxZ( z + 30 );
final int meteorXLength = w.minX( x - 30 );
final int meteorXHeight = w.maxX( x + 30 );
final int meteorZLength = w.minZ( z - 30 );
final int meteorZHeight = w.maxZ( z + 30 );
for( int i = meteorXLength; i < meteorXHeight; i++ )
{
@@ -389,26 +389,26 @@ public final class MeteoritePlacer
if( blk.isReplaceable( w.getWorld(), new BlockPos( i, j, k ) ) )
{
blk = Platform.AIR_BLOCK;
Block blk_b = w.getBlock( i, j + 1, k );
final Block blk_b = w.getBlock( i, j + 1, k );
if( blk_b != blk )
{
IBlockState meta_b = w.getBlockState( i, j + 1, k );
final IBlockState meta_b = w.getBlockState( i, j + 1, k );
w.setBlock( i, j, k, meta_b, 3 );
}
else if( randomShit < 100 * this.crater )
{
double dx = i - x;
double dy = j - y;
double dz = k - z;
double dist = dx * dx + dy * dy + dz * dz;
final double dx = i - x;
final double dy = j - y;
final double dz = k - z;
final double dist = dx * dx + dy * dy + dz * dz;
Block xf = w.getBlock( i, j - 1, k );
final Block xf = w.getBlock( i, j - 1, k );
if( !xf.isReplaceable( w.getWorld(), new BlockPos(i, j - 1, k) ) )
{
double extraRange = Math.random() * 0.6;
double height = this.crater * ( extraRange + 0.2 ) - Math.abs( dist - this.crater * 1.7 );
final double extraRange = Math.random() * 0.6;
final double height = this.crater * ( extraRange + 0.2 ) - Math.abs( dist - this.crater * 1.7 );
if( xf != blk && height > 0 && Math.random() > 0.6 )
{
@@ -421,14 +421,14 @@ public final class MeteoritePlacer
else
{
// decay.
Block blk_b = w.getBlock( i, j + 1, k );
final Block blk_b = w.getBlock( i, j + 1, k );
if( blk_b == Platform.AIR_BLOCK )
{
if( Math.random() > 0.4 )
{
double dx = i - x;
double dy = j - y;
double dz = k - z;
final double dx = i - x;
final double dy = j - y;
final double dz = k - z;
if( dx * dx + dy * dy + dz * dz < this.crater * 1.6 )
{
@@ -442,15 +442,15 @@ public final class MeteoritePlacer
}
}
public double getSqDistance( int x, int z )
public double getSqDistance( final int x, final int z )
{
int chunkX = this.settings.getInteger( "x" ) - x;
int chunkZ = this.settings.getInteger( "z" ) - z;
final int chunkX = this.settings.getInteger( "x" ) - x;
final int chunkZ = this.settings.getInteger( "z" ) - z;
return chunkX * chunkX + chunkZ * chunkZ;
}
public boolean spawnMeteorite( IMeteoriteWorld w, int x, int y, int z )
public boolean spawnMeteorite( final IMeteoriteWorld w, final int x, final int y, final int z )
{
if( !w.hasNoSky() )
@@ -527,7 +527,7 @@ public final class MeteoritePlacer
}
}
int minBLocks = 200;
final int minBLocks = 200;
if( validBlocks > minBLocks && realValidBlocks > 80 )
{
// we can spawn here!
src/main/java/appeng/worldgen/MeteoriteWorldGen.java
+17 -17
View File
@@ -38,17 +38,17 @@ import appeng.worldgen.meteorite.ChunkOnly;
public final class MeteoriteWorldGen implements IWorldGenerator
{
@Override
public void generate( Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider )
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkProvider chunkGenerator, final IChunkProvider chunkProvider )
{
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.Meteorites, w ) )
{
// add new meteorites?
if( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance )
{
int x = r.nextInt( 16 ) + ( chunkX << 4 );
int z = r.nextInt( 16 ) + ( chunkZ << 4 );
final int x = r.nextInt( 16 ) + ( chunkX << 4 );
final int z = r.nextInt( 16 ) + ( chunkZ << 4 );
int depth = 180 + r.nextInt( 20 );
final int depth = 180 + r.nextInt( 20 );
TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( x, depth, z ) );
}
else
@@ -62,16 +62,16 @@ public final class MeteoriteWorldGen implements IWorldGenerator
}
}
private boolean tryMeteorite( World w, int depth, int x, int z )
private boolean tryMeteorite( final World w, int depth, final int x, final int z )
{
for( int tries = 0; tries < 20; tries++ )
{
MeteoritePlacer mp = new MeteoritePlacer();
final MeteoritePlacer mp = new MeteoritePlacer();
if( mp.spawnMeteorite( new ChunkOnly( w, x >> 4, z >> 4 ), x, depth, z ) )
{
int px = x >> 4;
int pz = z >> 4;
final int px = x >> 4;
final int pz = z >> 4;
for( int cx = px - 6; cx < px + 6; cx++ )
{
@@ -86,7 +86,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
if( WorldData.instance().spawnData().hasGenerated( w.provider.getDimensionId(), cx, cz ) )
{
MeteoritePlacer mp2 = new MeteoritePlacer();
final MeteoritePlacer mp2 = new MeteoritePlacer();
mp2.spawnMeteorite( new ChunkOnly( w, cx, cz ), mp.getSettings() );
}
}
@@ -106,7 +106,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
return false;
}
private Iterable<NBTTagCompound> getNearByMeteorites( World w, int chunkX, int chunkZ )
private Iterable<NBTTagCompound> getNearByMeteorites( final World w, final int chunkX, final int chunkZ )
{
return WorldData.instance().spawnData().getNearByMeteorites( w.provider.getDimensionId(), chunkX, chunkZ );
}
@@ -118,7 +118,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
final int z;
final int depth;
public MeteoriteSpawn( int x, int depth, int z )
public MeteoriteSpawn( final int x, final int depth, final int z )
{
this.x = x;
this.z = z;
@@ -126,23 +126,23 @@ public final class MeteoriteWorldGen implements IWorldGenerator
}
@Override
public Object call( World world ) throws Exception
public Object call( final World world ) throws Exception
{
int chunkX = this.x >> 4;
int chunkZ = this.z >> 4;
final int chunkX = this.x >> 4;
final int chunkZ = this.z >> 4;
double minSqDist = Double.MAX_VALUE;
// near by meteorites!
for( NBTTagCompound data : MeteoriteWorldGen.this.getNearByMeteorites( world, chunkX, chunkZ ) )
for( final NBTTagCompound data : MeteoriteWorldGen.this.getNearByMeteorites( world, chunkX, chunkZ ) )
{
MeteoritePlacer mp = new MeteoritePlacer();
final MeteoritePlacer mp = new MeteoritePlacer();
mp.spawnMeteorite( new ChunkOnly( world, chunkX, chunkZ ), data );
minSqDist = Math.min( minSqDist, mp.getSqDistance( this.x, this.z ) );
}
boolean isCluster = ( minSqDist < 30 * 30 ) && Platform.getRandomFloat() < AEConfig.instance.meteoriteClusterChance;
final boolean isCluster = ( minSqDist < 30 * 30 ) && Platform.getRandomFloat() < AEConfig.instance.meteoriteClusterChance;
if( minSqDist > AEConfig.instance.minMeteoriteDistanceSq || isCluster )
{
src/main/java/appeng/worldgen/QuartzWorldGen.java
+10 -10
View File
@@ -54,14 +54,14 @@ public final class QuartzWorldGen implements IWorldGenerator
}
@Override
public void generate( Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider )
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkProvider chunkGenerator, final IChunkProvider chunkProvider )
{
int seaLevel = w.provider.getAverageGroundLevel() + 1;
if( seaLevel < 20 )
{
int x = ( chunkX << 4 ) + 8;
int z = ( chunkZ << 4 ) + 8;
final int x = ( chunkX << 4 ) + 8;
final int z = ( chunkZ << 4 ) + 8;
seaLevel = (int) w.getHorizon();
}
@@ -70,19 +70,19 @@ public final class QuartzWorldGen implements IWorldGenerator
return;
}
double oreDepthMultiplier = AEConfig.instance.quartzOresClusterAmount * seaLevel / 64;
int scale = (int) Math.round( r.nextGaussian() * Math.sqrt( oreDepthMultiplier ) + oreDepthMultiplier );
final double oreDepthMultiplier = AEConfig.instance.quartzOresClusterAmount * seaLevel / 64;
final int scale = (int) Math.round( r.nextGaussian() * Math.sqrt( oreDepthMultiplier ) + oreDepthMultiplier );
for( int x = 0; x < ( r.nextBoolean() ? scale * 2 : scale ) / 2; ++x )
{
boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance;
WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal;
final boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance;
final WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal;
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( isCharged ? WorldGenType.ChargedCertusQuartz : WorldGenType.CertusQuartz, w ) )
{
int cx = chunkX * 16 + r.nextInt( 22 );
int cy = r.nextInt( 40 * seaLevel / 64 ) + r.nextInt( 22 * seaLevel / 64 ) + 12 * seaLevel / 64;
int cz = chunkZ * 16 + r.nextInt( 22 );
final int cx = chunkX * 16 + r.nextInt( 22 );
final int cy = r.nextInt( 40 * seaLevel / 64 ) + r.nextInt( 22 * seaLevel / 64 ) + 12 * seaLevel / 64;
final int cz = chunkZ * 16 + r.nextInt( 22 );
whichOre.generate( w, r, new BlockPos( cx, cy, cz ) );
}
}
src/main/java/appeng/worldgen/meteorite/ChunkOnly.java
+9 -9
View File
@@ -17,7 +17,7 @@ public class ChunkOnly extends StandardWorld
final int cz;
int verticalBits = 0;
public ChunkOnly( World w, int cx, int cz )
public ChunkOnly( final World w, final int cx, final int cz )
{
super( w );
this.target = w.getChunkFromChunkCoords( cx, cz );
@@ -26,31 +26,31 @@ public class ChunkOnly extends StandardWorld
}
@Override
public int minX( int in )
public int minX( final int in )
{
return Math.max( in, this.cx << 4 );
}
@Override
public int minZ( int in )
public int minZ( final int in )
{
return Math.max( in, this.cz << 4 );
}
@Override
public int maxX( int in )
public int maxX( final int in )
{
return Math.min( in, ( this.cx + 1 ) << 4 );
}
@Override
public int maxZ( int in )
public int maxZ( final int in )
{
return Math.min( in, ( this.cz + 1 ) << 4 );
}
@Override
public Block getBlock( int x, int y, int z )
public Block getBlock( final int x, final int y, final int z )
{
if( this.range( x, y, z ) )
{
@@ -60,7 +60,7 @@ public class ChunkOnly extends StandardWorld
}
@Override
public void setBlock( int x, int y, int z, Block blk )
public void setBlock( final int x, final int y, final int z, final Block blk )
{
if( this.range( x, y, z ) )
{
@@ -70,7 +70,7 @@ public class ChunkOnly extends StandardWorld
}
@Override
public void setBlock( int x, int y, int z, IBlockState state, int flags )
public void setBlock( final int x, final int y, final int z, final IBlockState state, final int flags )
{
if( this.range( x, y, z ) )
{
@@ -89,7 +89,7 @@ public class ChunkOnly extends StandardWorld
}
@Override
public boolean range( int x, int y, int z )
public boolean range( final int x, final int y, final int z )
{
return this.cx == ( x >> 4 ) && this.cz == ( z >> 4 );
}
src/main/java/appeng/worldgen/meteorite/Fallout.java
+6 -6
View File
@@ -12,7 +12,7 @@ public class Fallout
private final MeteoriteBlockPutter putter;
private final IBlockDefinition skyStoneDefinition;
public Fallout( MeteoriteBlockPutter putter, IBlockDefinition skyStoneDefinition )
public Fallout( final MeteoriteBlockPutter putter, final IBlockDefinition skyStoneDefinition )
{
this.putter = putter;
this.skyStoneDefinition = skyStoneDefinition;
@@ -23,9 +23,9 @@ public class Fallout
return 0;
}
public void getRandomFall( IMeteoriteWorld w, int x, int y, int z )
public void getRandomFall( final IMeteoriteWorld w, final int x, final int y, final int z )
{
double a = Math.random();
final double a = Math.random();
if( a > 0.9 )
{
this.putter.put( w, x, y, z, Blocks.stone );
@@ -44,9 +44,9 @@ public class Fallout
}
}
public void getRandomInset( IMeteoriteWorld w, int x, int y, int z )
public void getRandomInset( final IMeteoriteWorld w, final int x, final int y, final int z )
{
double a = Math.random();
final double a = Math.random();
if( a > 0.9 )
{
this.putter.put( w, x, y, z, Blocks.cobblestone );
@@ -61,7 +61,7 @@ public class Fallout
}
else if( a > 0.6 )
{
for( Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() )
for( final Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() )
{
this.putter.put( w, x, y, z, skyStoneBlock );
}
src/main/java/appeng/worldgen/meteorite/FalloutCopy.java
+6 -6
View File
@@ -15,7 +15,7 @@ public class FalloutCopy extends Fallout
private final IBlockState block;
private final MeteoriteBlockPutter putter;
public FalloutCopy( IMeteoriteWorld w, int x, int y, int z, MeteoriteBlockPutter putter, IBlockDefinition skyStoneDefinition )
public FalloutCopy( final IMeteoriteWorld w, final int x, final int y, final int z, final MeteoriteBlockPutter putter, final IBlockDefinition skyStoneDefinition )
{
super( putter, skyStoneDefinition );
this.putter = putter;
@@ -23,9 +23,9 @@ public class FalloutCopy extends Fallout
}
@Override
public void getRandomFall( IMeteoriteWorld w, int x, int y, int z )
public void getRandomFall( final IMeteoriteWorld w, final int x, final int y, final int z )
{
double a = Math.random();
final double a = Math.random();
if( a > SPECIFIED_BLOCK_THRESHOLD )
{
this.putter.put( w, x, y, z, this.block, 3 );
@@ -36,15 +36,15 @@ public class FalloutCopy extends Fallout
}
}
public void getOther( IMeteoriteWorld w, int x, int y, int z, double a )
public void getOther( final IMeteoriteWorld w, final int x, final int y, final int z, final double a )
{
}
@Override
public void getRandomInset( IMeteoriteWorld w, int x, int y, int z )
public void getRandomInset( final IMeteoriteWorld w, final int x, final int y, final int z )
{
double a = Math.random();
final double a = Math.random();
if( a > SPECIFIED_BLOCK_THRESHOLD )
{
this.putter.put( w, x, y, z, this.block, 3 );
src/main/java/appeng/worldgen/meteorite/FalloutSand.java
+2 -2
View File
@@ -10,7 +10,7 @@ public class FalloutSand extends FalloutCopy
public static final double GLASS_THRESHOLD = 0.66;
private final MeteoriteBlockPutter putter;
public FalloutSand( IMeteoriteWorld w, int x, int y, int z, MeteoriteBlockPutter putter, IBlockDefinition skyStoneDefinition )
public FalloutSand( final IMeteoriteWorld w, final int x, final int y, final int z, final MeteoriteBlockPutter putter, final IBlockDefinition skyStoneDefinition )
{
super( w, x, y, z, putter, skyStoneDefinition );
this.putter = putter;
@@ -23,7 +23,7 @@ public class FalloutSand extends FalloutCopy
}
@Override
public void getOther( IMeteoriteWorld w, int x, int y, int z, double a )
public void getOther( final IMeteoriteWorld w, final int x, final int y, final int z, final double a )
{
if( a > GLASS_THRESHOLD )
{
src/main/java/appeng/worldgen/meteorite/FalloutSnow.java
+2 -2
View File
@@ -11,7 +11,7 @@ public class FalloutSnow extends FalloutCopy
public static final double ICE_THRESHOLD = 0.5;
private final MeteoriteBlockPutter putter;
public FalloutSnow( IMeteoriteWorld w, int x, int y, int z, MeteoriteBlockPutter putter, IBlockDefinition skyStoneDefinition )
public FalloutSnow( final IMeteoriteWorld w, final int x, final int y, final int z, final MeteoriteBlockPutter putter, final IBlockDefinition skyStoneDefinition )
{
super( w, x, y, z, putter, skyStoneDefinition );
this.putter = putter;
@@ -24,7 +24,7 @@ public class FalloutSnow extends FalloutCopy
}
@Override
public void getOther( IMeteoriteWorld w, int x, int y, int z, double a )
public void getOther( final IMeteoriteWorld w, final int x, final int y, final int z, final double a )
{
if( a > SNOW_THRESHOLD )
{
src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java
+3 -3
View File
@@ -8,9 +8,9 @@ import net.minecraft.init.Blocks;
public class MeteoriteBlockPutter
{
public boolean put( IMeteoriteWorld w, int i, int j, int k, Block blk )
public boolean put( final IMeteoriteWorld w, final int i, final int j, final int k, final Block blk )
{
Block original = w.getBlock( i, j, k );
final Block original = w.getBlock( i, j, k );
if( original == Blocks.bedrock || original == blk )
{
@@ -21,7 +21,7 @@ public class MeteoriteBlockPutter
return true;
}
public void put( IMeteoriteWorld w, int i, int j, int k, IBlockState state, int meta )
public void put( final IMeteoriteWorld w, final int i, final int j, final int k, final IBlockState state, final int meta )
{
if( w.getBlock( i, j, k ) == Blocks.bedrock )
{
src/main/java/appeng/worldgen/meteorite/StandardWorld.java
+18 -18
View File
@@ -15,31 +15,31 @@ public class StandardWorld implements IMeteoriteWorld
protected final World w;
public StandardWorld( World w )
public StandardWorld( final World w )
{
this.w = w;
}
@Override
public int minX( int in )
public int minX( final int in )
{
return in;
}
@Override
public int minZ( int in )
public int minZ( final int in )
{
return in;
}
@Override
public int maxX( int in )
public int maxX( final int in )
{
return in;
}
@Override
public int maxZ( int in )
public int maxZ( final int in )
{
return in;
}
@@ -51,7 +51,7 @@ public class StandardWorld implements IMeteoriteWorld
}
@Override
public Block getBlock( int x, int y, int z )
public Block getBlock( final int x, final int y, final int z )
{
if( this.range( x, y, z ) )
{
@@ -61,7 +61,7 @@ public class StandardWorld implements IMeteoriteWorld
}
@Override
public boolean canBlockSeeTheSky( int x, int y, int z )
public boolean canBlockSeeTheSky( final int x, final int y, final int z )
{
if( this.range( x, y, z ) )
{
@@ -71,7 +71,7 @@ public class StandardWorld implements IMeteoriteWorld
}
@Override
public TileEntity getTileEntity( int x, int y, int z )
public TileEntity getTileEntity( final int x, final int y, final int z )
{
if( this.range( x, y, z ) )
{
@@ -87,7 +87,7 @@ public class StandardWorld implements IMeteoriteWorld
}
@Override
public void setBlock( int x, int y, int z, Block blk )
public void setBlock( final int x, final int y, final int z, final Block blk )
{
if( this.range( x, y, z ) )
{
@@ -101,18 +101,18 @@ public class StandardWorld implements IMeteoriteWorld
}
public boolean range( int x, int y, int z )
public boolean range( final int x, final int y, final int z )
{
return true;
}
@Override
public void setBlock(
int x,
int y,
int z,
IBlockState state,
int l )
final int x,
final int y,
final int z,
final IBlockState state,
final int l )
{
if( this.range( x, y, z ) )
{
@@ -122,9 +122,9 @@ public class StandardWorld implements IMeteoriteWorld
@Override
public IBlockState getBlockState(
int x,
int y,
int z )
final int x,
final int y,
final int z )
{
if( this.range( x, y, z ) )
{