Renamed constants

This commit is contained in:
thatsIch
2015-01-01 22:13:10 +01:00
parent e0175bac98
commit 52c512635d
118 changed files with 511 additions and 508 deletions
@@ -27,7 +27,7 @@ import appeng.core.sync.packets.PacketCompassRequest;
public class CompassManager
{
public static final CompassManager instance = new CompassManager();
public static final CompassManager INSTANCE = new CompassManager();
static class CompassRequest
{
@@ -58,7 +58,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator
@Override
public void generate(Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
{
if ( WorldGenRegistry.instance.isWorldGenEnabled( WorldGenType.Meteorites, w ) )
if ( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.Meteorites, w ) )
{
// add new meteorites?
if ( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance )
@@ -67,10 +67,10 @@ final public class MeteoriteWorldGen implements IWorldGenerator
int z = r.nextInt( 16 ) + (chunkZ << 4);
int depth = 180 + r.nextInt( 20 );
TickHandler.instance.addCallable( w, new MeteoriteSpawn( x, depth, z, w ) );
TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( x, depth, z, w ) );
}
else
TickHandler.instance.addCallable( w, new MeteoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) );
TickHandler.INSTANCE.addCallable( w, new MeteoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) );
}
else
WorldSettings.getInstance().getCompass().updateArea( w, chunkX, chunkZ );
@@ -75,7 +75,7 @@ final public class QuartzWorldGen implements IWorldGenerator
boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance;
WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal;
if ( WorldGenRegistry.instance.isWorldGenEnabled( isCharged ? WorldGenType.ChargedCertusQuartz : WorldGenType.CertusQuartz, w ) )
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;
+1 -1
View File
@@ -74,7 +74,7 @@ public class TickHandler
}
final public static TickHandler instance = new TickHandler();
public static final TickHandler INSTANCE = new TickHandler();
final private WeakHashMap<World, Queue<Callable>> callQueue = new WeakHashMap<World, Queue<Callable>>();
final Queue<Callable> serverQueue = new LinkedList<Callable>();