First update pass (1/3) - ~1400 -> 82 errors

This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.

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

@@ -4,7 +4,7 @@ package appeng.worldgen.meteorite;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 
@@ -56,7 +56,7 @@ public class ChunkOnly extends StandardWorld
 	{
 		if( this.range( x, y, z ) )
 		{
-			return this.target.getBlock( x, y, z );
+			return this.target.getBlockState( x, y, z ).getBlock();
 		}
 		return Platform.AIR_BLOCK;
 	}

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

@@ -30,19 +30,19 @@ public class Fallout
 		final double a = Math.random();
 		if( a > 0.9 )
 		{
-			this.putter.put( w, x, y, z, Blocks.stone );
+			this.putter.put( w, x, y, z, Blocks.STONE );
 		}
 		else if( a > 0.8 )
 		{
-			this.putter.put( w, x, y, z, Blocks.cobblestone );
+			this.putter.put( w, x, y, z, Blocks.COBBLESTONE );
 		}
 		else if( a > 0.7 )
 		{
-			this.putter.put( w, x, y, z, Blocks.dirt );
+			this.putter.put( w, x, y, z, Blocks.DIRT );
 		}
 		else
 		{
-			this.putter.put( w, x, y, z, Blocks.gravel );
+			this.putter.put( w, x, y, z, Blocks.GRAVEL );
 		}
 	}
 
@@ -51,15 +51,15 @@ public class Fallout
 		final double a = Math.random();
 		if( a > 0.9 )
 		{
-			this.putter.put( w, x, y, z, Blocks.cobblestone );
+			this.putter.put( w, x, y, z, Blocks.COBBLESTONE );
 		}
 		else if( a > 0.8 )
 		{
-			this.putter.put( w, x, y, z, Blocks.stone );
+			this.putter.put( w, x, y, z, Blocks.STONE );
 		}
 		else if( a > 0.7 )
 		{
-			this.putter.put( w, x, y, z, Blocks.grass );
+			this.putter.put( w, x, y, z, Blocks.GRASS );
 		}
 		else if( a > 0.6 )
 		{
@@ -70,7 +70,7 @@ public class Fallout
 		}
 		else if( a > 0.5 )
 		{
-			this.putter.put( w, x, y, z, Blocks.gravel );
+			this.putter.put( w, x, y, z, Blocks.GRAVEL );
 		}
 		else
 		{

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

@@ -29,7 +29,7 @@ public class FalloutSand extends FalloutCopy
 	{
 		if( a > GLASS_THRESHOLD )
 		{
-			this.putter.put( w, x, y, z, Blocks.glass );
+			this.putter.put( w, x, y, z, Blocks.GLASS );
 		}
 	}
 }

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

@@ -30,11 +30,11 @@ public class FalloutSnow extends FalloutCopy
 	{
 		if( a > SNOW_THRESHOLD )
 		{
-			this.putter.put( w, x, y, z, Blocks.snow );
+			this.putter.put( w, x, y, z, Blocks.SNOW );
 		}
 		else if( a > ICE_THRESHOLD )
 		{
-			this.putter.put( w, x, y, z, Blocks.ice );
+			this.putter.put( w, x, y, z, Blocks.ICE );
 		}
 	}
 }

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

@@ -13,7 +13,7 @@ public class MeteoriteBlockPutter
 	{
 		final Block original = w.getBlock( i, j, k );
 
-		if( original == Blocks.bedrock || original == blk )
+		if( original == Blocks.BEDROCK || original == blk )
 		{
 			return false;
 		}
@@ -24,7 +24,7 @@ public class MeteoriteBlockPutter
 
 	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 )
+		if( w.getBlock( i, j, k ) == Blocks.BEDROCK )
 		{
 			return;
 		}

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

@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import appeng.util.Platform;
@@ -124,6 +124,6 @@ public class StandardWorld implements IMeteoriteWorld
 		{
 			return this.w.getBlockState( new BlockPos( x, y, z ) );
 		}
-		return Blocks.air.getDefaultState();
+		return Blocks.AIR.getDefaultState();
 	}
 }