Replaces all constants regarding their naming conventions

src/main/java/appeng/block/misc/BlockPaint.java

@@ -110,7 +110,7 @@ public class BlockPaint extends AEBaseBlock
 	{
 		if( Platform.isServer() )
 		{
-			w.setBlock( x, y, z, Platform.AIR, 0, 3 );
+			w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 );
 		}
 	}
 

src/main/java/appeng/debug/TileCubeGenerator.java

@@ -64,7 +64,7 @@ public class TileCubeGenerator extends AEBaseTile
 
 	void spawn()
 	{
-		this.worldObj.setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR, 0, 3 );
+		this.worldObj.setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK, 0, 3 );
 
 		Item i = this.is.getItem();
 		int side = ForgeDirection.UP.ordinal();

src/main/java/appeng/debug/ToolEraser.java

@@ -82,7 +82,7 @@ public class ToolEraser extends AEBaseItem
 				if( c_blk == blk && c_meta == meta )
 				{
 					blocks++;
-					world.setBlock( wc.x, wc.y, wc.z, Platform.AIR );
+					world.setBlock( wc.x, wc.y, wc.z, Platform.AIR_BLOCK );
 
 					this.wrappedAdd( world, wc.x + 1, wc.y, wc.z, next );
 					this.wrappedAdd( world, wc.x - 1, wc.y, wc.z, next );

src/main/java/appeng/items/materials/ItemMultiMaterial.java

@@ -31,6 +31,9 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
@@ -47,9 +50,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.oredict.OreDictionary;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
-
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.implementations.items.IItemGroup;
@@ -71,7 +71,7 @@ import appeng.util.Platform;
 
 public final class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule
 {
-	public static final int KILO = 1024;
+	public static final int KILO_SCALAR = 1024;
 	public static ItemMultiMaterial instance;
 
 	private final Map<Integer, MaterialType> dmgToMaterial = new HashMap<Integer, MaterialType>();
@@ -415,13 +415,13 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo
 		switch( this.getTypeByStack( is ) )
 		{
 			case Cell1kPart:
-				return KILO;
+				return KILO_SCALAR;
 			case Cell4kPart:
-				return KILO * 4;
+				return KILO_SCALAR * 4;
 			case Cell16kPart:
-				return KILO * 16;
+				return KILO_SCALAR * 16;
 			case Cell64kPart:
-				return KILO * 64;
+				return KILO_SCALAR * 64;
 			default:
 		}
 		return 0;

src/main/java/appeng/items/misc/ItemCrystalSeed.java

@@ -58,10 +58,10 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
 	public static final int LEVEL_OFFSET = 200;
 	public static final int SINGLE_OFFSET = LEVEL_OFFSET * 3;
 
-	public static final int Certus = 0;
+	public static final int CERTUS = 0;
-	public static final int Nether = SINGLE_OFFSET;
+	public static final int NETHER = SINGLE_OFFSET;
-	public static final int Fluix = SINGLE_OFFSET * 2;
+	public static final int FLUIX = SINGLE_OFFSET * 2;
-	public static final int END = SINGLE_OFFSET * 3;
+	public static final int FINAL_STAGE = SINGLE_OFFSET * 3;
 
 	final IIcon[] certus = new IIcon[3];
 	final IIcon[] fluix = new IIcon[3];
@@ -120,28 +120,28 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
 		final IMaterials materials = AEApi.instance().definitions().materials();
 		final int size = is.stackSize;
 
-		if( newDamage == Certus + SINGLE_OFFSET )
+		if( newDamage == CERTUS + SINGLE_OFFSET )
 		{
 			for( ItemStack quartzStack : materials.purifiedCertusQuartzCrystal().maybeStack( size ).asSet() )
 			{
 				return quartzStack;
 			}
 		}
-		if( newDamage == Nether + SINGLE_OFFSET )
+		if( newDamage == NETHER + SINGLE_OFFSET )
 		{
 			for( ItemStack quartzStack : materials.purifiedNetherQuartzCrystal().maybeStack( size ).asSet() )
 			{
 				return quartzStack;
 			}
 		}
-		if( newDamage == Fluix + SINGLE_OFFSET )
+		if( newDamage == FLUIX + SINGLE_OFFSET )
 		{
 			for( ItemStack quartzStack : materials.purifiedFluixCrystal().maybeStack( size ).asSet() )
 			{
 				return quartzStack;
 			}
 		}
-		if( newDamage > END )
+		if( newDamage > FINAL_STAGE )
 		{
 			return null;
 		}
@@ -184,17 +184,17 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
 	{
 		int damage = this.getProgress( is );
 
-		if( damage < Certus + SINGLE_OFFSET )
+		if( damage < CERTUS + SINGLE_OFFSET )
 		{
 			return this.getUnlocalizedName() + ".Certus";
 		}
 
-		if( damage < Nether + SINGLE_OFFSET )
+		if( damage < NETHER + SINGLE_OFFSET )
 		{
 			return this.getUnlocalizedName() + ".Nether";
 		}
 
-		if( damage < Fluix + SINGLE_OFFSET )
+		if( damage < FLUIX + SINGLE_OFFSET )
 		{
 			return this.getUnlocalizedName() + ".Fluix";
 		}
@@ -217,7 +217,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
 	@Override
 	public int getMaxDamage( ItemStack stack )
 	{
-		return END;
+		return FINAL_STAGE;
 	}
 
 	@Override
@@ -233,19 +233,19 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
 
 		int damage = this.getProgress( stack );
 
-		if( damage < Certus + SINGLE_OFFSET )
+		if( damage < CERTUS + SINGLE_OFFSET )
 		{
 			list = this.certus;
 		}
-		else if( damage < Nether + SINGLE_OFFSET )
+		else if( damage < NETHER + SINGLE_OFFSET )
 		{
-			damage -= Nether;
+			damage -= NETHER;
 			list = this.nether;
 		}
 
-		else if( damage < Fluix + SINGLE_OFFSET )
+		else if( damage < FLUIX + SINGLE_OFFSET )
 		{
-			damage -= Fluix;
+			damage -= FLUIX;
 			list = this.fluix;
 		}
 
@@ -313,18 +313,18 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
 	public void getSubItems( Item i, CreativeTabs t, List l )
 	{
 		// lvl 0
-		l.add( newStyle( new ItemStack( this, 1, Certus ) ) );
+		l.add( newStyle( new ItemStack( this, 1, CERTUS ) ) );
-		l.add( newStyle( new ItemStack( this, 1, Nether ) ) );
+		l.add( newStyle( new ItemStack( this, 1, NETHER ) ) );
-		l.add( newStyle( new ItemStack( this, 1, Fluix ) ) );
+		l.add( newStyle( new ItemStack( this, 1, FLUIX ) ) );
 
 		// lvl 1
-		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + Certus ) ) );
+		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + CERTUS ) ) );
-		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + Nether ) ) );
+		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + NETHER ) ) );
-		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + Fluix ) ) );
+		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET + FLUIX ) ) );
 
 		// lvl 2
-		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + Certus ) ) );
+		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + CERTUS ) ) );
-		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + Nether ) ) );
+		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + NETHER ) ) );
-		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + Fluix ) ) );
+		l.add( newStyle( new ItemStack( this, 1, LEVEL_OFFSET * 2 + FLUIX ) ) );
 	}
 }

src/main/java/appeng/items/tools/ToolNetworkTool.java

@@ -151,7 +151,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench,
 				{
 					if( b.rotateBlock( w, x, y, z, ForgeDirection.getOrientation( side ) ) )
 					{
-						b.onNeighborBlockChange( w, x, y, z, Platform.AIR );
+						b.onNeighborBlockChange( w, x, y, z, Platform.AIR_BLOCK );
 						p.swingItem();
 						return !w.isRemote;
 					}

src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java

@@ -141,7 +141,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 		}
 		else
 		{
-			w.setBlock( x, y, z, Platform.AIR, 0, 3 );
+			w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 );
 		}
 
 		if( r.Drops != null )
@@ -177,7 +177,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 		}
 		else
 		{
-			w.setBlock( x, y, z, Platform.AIR, 0, 3 );
+			w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 );
 		}
 
 		if( r.Drops != null )
@@ -266,14 +266,14 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 			{
 				if( blockID instanceof BlockTNT )
 				{
-					w.setBlock( x, y, z, Platform.AIR, 0, 3 );
+					w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 );
 					( (BlockTNT) blockID ).func_150114_a( w, x, y, z, 1, p );
 					return true;
 				}
 
 				if( blockID instanceof BlockTinyTNT )
 				{
-					w.setBlock( x, y, z, Platform.AIR, 0, 3 );
+					w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 );
 					( (BlockTinyTNT) blockID ).startFuse( w, x, y, z, p );
 					return true;
 				}
@@ -321,7 +321,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 
 					if( or.BlockItem == null )
 					{
-						w.setBlock( x, y, z, Platform.AIR, 0, 3 );
+						w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 );
 					}
 					else
 					{

src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java

@@ -65,7 +65,7 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren
 			ForgeDirection mySide = ForgeDirection.getOrientation( side );
 			if( b.rotateBlock( world, x, y, z, mySide ) )
 			{
-				b.onNeighborBlockChange( world, x, y, z, Platform.AIR );
+				b.onNeighborBlockChange( world, x, y, z, Platform.AIR_BLOCK );
 				player.swingItem();
 				return !world.isRemote;
 			}

src/main/java/appeng/parts/automation/PartAnnihilationPlane.java

@@ -408,7 +408,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
 						{
 							if( modulate )
 							{
-								w.setBlock( x, y, z, Platform.AIR, 0, 3 );
+								w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 );
 								energy.extractAEPower( total, Actionable.MODULATE, PowerMultiplier.CONFIG );
 
 								final AxisAlignedBB box = AxisAlignedBB.getBoundingBox( x - 0.2, y - 0.2, z - 0.2, x + 1.2, y + 1.2, z + 1.2 );

src/main/java/appeng/recipes/AEItemResolver.java

@@ -105,15 +105,15 @@ public class AEItemResolver implements ISubItemResolver
 			{
 				if( itemName.equalsIgnoreCase( "ItemCrystalSeed.Certus" ) )
 				{
-					return ItemCrystalSeed.getResolver( ItemCrystalSeed.Certus );
+					return ItemCrystalSeed.getResolver( ItemCrystalSeed.CERTUS );
 				}
 				if( itemName.equalsIgnoreCase( "ItemCrystalSeed.Nether" ) )
 				{
-					return new ResolverResult( "ItemCrystalSeed", ItemCrystalSeed.Nether );
+					return new ResolverResult( "ItemCrystalSeed", ItemCrystalSeed.NETHER );
 				}
 				if( itemName.equalsIgnoreCase( "ItemCrystalSeed.Fluix" ) )
 				{
-					return new ResolverResult( "ItemCrystalSeed", ItemCrystalSeed.Fluix );
+					return new ResolverResult( "ItemCrystalSeed", ItemCrystalSeed.FLUIX );
 				}
 
 				return null;

src/main/java/appeng/recipes/RecipeHandler.java

@@ -135,15 +135,15 @@ public class RecipeHandler implements IRecipeHandler
 		if( maybeCrystalSeedItem.isPresent() && is.getItem() == maybeCrystalSeedItem.get() )
 		{
 			int dmg = is.getItemDamage();
-			if( dmg < ItemCrystalSeed.Nether )
+			if( dmg < ItemCrystalSeed.NETHER )
 			{
 				realName += ".Certus";
 			}
-			else if( dmg < ItemCrystalSeed.Fluix )
+			else if( dmg < ItemCrystalSeed.FLUIX )
 			{
 				realName += ".Nether";
 			}
-			else if( dmg < ItemCrystalSeed.END )
+			else if( dmg < ItemCrystalSeed.FINAL_STAGE )
 			{
 				realName += ".Fluix";
 			}

src/main/java/appeng/spatial/CachedPlane.java

@@ -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.setBlock( te.xCoord, te.yCoord, te.zCoord, Platform.AIR_BLOCK );
-								c.worldObj.notifyBlocksOfNeighborChange( te.xCoord, te.yCoord, te.zCoord, Platform.AIR );
+								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

@@ -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 );
 		}
 	}
 

src/main/java/appeng/tile/grindstone/TileCrank.java

@@ -104,7 +104,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision
 	public void setOrientation( ForgeDirection inForward, ForgeDirection inUp )
 	{
 		super.setOrientation( inForward, inUp );
-		this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.AIR );
+		this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK );
 	}
 
 	@Override

src/main/java/appeng/tile/grindstone/TileGrinder.java

@@ -50,7 +50,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable
 	public void setOrientation( ForgeDirection inForward, ForgeDirection inUp )
 	{
 		super.setOrientation( inForward, inUp );
-		this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.AIR );
+		this.getBlockType().onNeighborBlockChange( this.worldObj, this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK );
 	}
 
 	@Override

src/main/java/appeng/tile/networking/TileCableBus.java

@@ -334,7 +334,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
 			}
 		}
 
-		this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR );
+		this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK );
 	}	@Override
 	public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
 	{

src/main/java/appeng/util/BlockUpdate.java

@@ -45,7 +45,7 @@ public class BlockUpdate implements Callable
 	{
 		if( this.w.blockExists( this.x, this.y, this.z ) )
 		{
-			this.w.notifyBlocksOfNeighborChange( this.x, this.y, this.z, Platform.AIR );
+			this.w.notifyBlocksOfNeighborChange( this.x, this.y, this.z, Platform.AIR_BLOCK );
 		}
 
 		return true;

src/main/java/appeng/util/Platform.java

@@ -151,7 +151,7 @@ import appeng.util.prioitylist.IPartitionList;
 public class Platform
 {
 
-	public static final Block AIR = Blocks.air;
+	public static final Block AIR_BLOCK = Blocks.air;
 
 	public static final int DEF_OFFSET = 16;
 

src/main/java/appeng/worldgen/MeteoritePlacer.java

@@ -191,7 +191,7 @@ public final class MeteoritePlacer
 						}
 						else
 						{
-							changed = this.putter.put( w, i, j, k, Platform.AIR ) || changed;
+							changed = this.putter.put( w, i, j, k, Platform.AIR_BLOCK ) || changed;
 						}
 					}
 				}
@@ -380,7 +380,7 @@ public final class MeteoritePlacer
 
 					if( blk.isReplaceable( w.getWorld(), i, j, k ) )
 					{
-						blk = Platform.AIR;
+						blk = Platform.AIR_BLOCK;
 						Block blk_b = w.getBlock( i, j + 1, k );
 
 						if( blk_b != blk )
@@ -415,7 +415,7 @@ public final class MeteoritePlacer
 					{
 						// decay.
 						Block blk_b = w.getBlock( i, j + 1, k );
-						if( blk_b == Platform.AIR )
+						if( blk_b == Platform.AIR_BLOCK )
 						{
 							if( Math.random() > 0.4 )
 							{
@@ -544,7 +544,7 @@ public final class MeteoritePlacer
 			boolean solid = true;
 			for( int j = y - 15; j < y - 1; j++ )
 			{
-				if( w.getBlock( x, j, z ) == Platform.AIR )
+				if( w.getBlock( x, j, z ) == Platform.AIR_BLOCK )
 				{
 					solid = false;
 				}

src/main/java/appeng/worldgen/meteorite/ChunkOnly.java

@@ -65,7 +65,7 @@ public class ChunkOnly extends StandardWorld
 		{
 			return this.target.getBlock( x & 0xF, y, z & 0xF );
 		}
-		return Platform.AIR;
+		return Platform.AIR_BLOCK;
 	}
 
 	@Override

src/main/java/appeng/worldgen/meteorite/Fallout.java

@@ -73,7 +73,7 @@ public class Fallout
 		}
 		else
 		{
-			this.putter.put( w, x, y, z, Platform.AIR );
+			this.putter.put( w, x, y, z, Platform.AIR_BLOCK );
 		}
 	}
 }

src/main/java/appeng/worldgen/meteorite/FalloutCopy.java

@@ -54,7 +54,7 @@ public class FalloutCopy extends Fallout
 		}
 		else if( a > AIR_BLOCK_THRESHOLD )
 		{
-			this.putter.put( w, x, y, z, Platform.AIR );
+			this.putter.put( w, x, y, z, Platform.AIR_BLOCK );
 		}
 		else
 		{

src/main/java/appeng/worldgen/meteorite/StandardWorld.java

@@ -65,7 +65,7 @@ public class StandardWorld implements IMeteoriteWorld
 		{
 			return this.w.getBlock( x, y, z );
 		}
-		return Platform.AIR;
+		return Platform.AIR_BLOCK;
 	}
 
 	@Override