Most of the 1.8 Port.

src/main/java/appeng/block/networking/BlockCableBus.java

@@ -24,40 +24,33 @@ import java.util.List;
 import java.util.Random;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.client.particle.EntityDiggingFX;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection;
-import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType;
-
-import appeng.api.parts.IPart;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.PartItemStack;
 import appeng.api.parts.SelectedPart;
 import appeng.api.util.AEColor;
 import appeng.block.AEBaseTileBlock;
 import appeng.client.render.BaseBlockRender;
-import appeng.client.render.BusRenderHelper;
 import appeng.client.render.blocks.RendererCableBus;
-import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AEConfig;
 import appeng.core.Api;
 import appeng.core.CommonHelper;
@@ -72,13 +65,11 @@ import appeng.parts.NullCableBusContainer;
 import appeng.tile.AEBaseTile;
 import appeng.tile.networking.TileCableBus;
 import appeng.tile.networking.TileCableBusTESR;
-import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 
-
-@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR" )
-public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
+// TODO: MFR INTEGRATION
+//@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR" )
+public class BlockCableBus extends AEBaseTileBlock // implements IRedNetConnection
 {
 
 	private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
@@ -88,7 +79,6 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 	 * Immibis MB Support.
 	 */
 	boolean ImmibisMicroblocks_TransformableBlockMarker = true;
-	int myColorMultiplier = 0xffffff;
 
 	public BlockCableBus()
 	{
@@ -102,43 +92,41 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 	}
 
 	@Override
-	public void randomDisplayTick( World world, int x, int y, int z, Random r )
+	public void randomDisplayTick(
+			World worldIn,
+			BlockPos pos,
+			IBlockState state,
+			Random rand )
 	{
-		this.cb( world, x, y, z ).randomDisplayTick( world, x, y, z, r );
+		this.cb( worldIn, pos ).randomDisplayTick( worldIn, pos, rand );
 	}
 
 	@Override
-	public void onNeighborBlockChange( World w, int x, int y, int z, Block meh )
+	public void onNeighborChange(
+			IBlockAccess w,
+			BlockPos pos,
+			BlockPos neighbor )
 	{
-		this.cb( w, x, y, z ).onNeighborChanged();
+		this.cb( w, pos ).onNeighborChanged();
 	}
 
 	@Override
-	public Item getItemDropped( int i, Random r, int k )
+	public Item getItemDropped(
+			IBlockState state,
+			Random rand,
+			int fortune )
 	{
 		return null;
 	}
 
 	@Override
-	public int getRenderBlockPass()
+	public int isProvidingWeakPower(
+			IBlockAccess w,
+			BlockPos pos,
+			IBlockState state,
+			EnumFacing side )
 	{
-		if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
-		{
-			return 1;
-		}
-		return 0;
-	}
-
-	@Override
-	public int colorMultiplier( IBlockAccess world, int x, int y, int z )
-	{
-		return this.myColorMultiplier;
-	}
-
-	@Override
-	public int isProvidingWeakPower( IBlockAccess w, int x, int y, int z, int side )
-	{
-		return this.cb( w, x, y, z ).isProvidingWeakPower( ForgeDirection.getOrientation( side ).getOpposite() );
+		return this.cb( w, pos ).isProvidingWeakPower( side.getOpposite() ); // TODO: IS OPPOSITE!?
 	}
 
 	@Override
@@ -148,104 +136,113 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock( World w, int x, int y, int z, Entity e )
+	public void onEntityCollidedWithBlock(
+			World w,
+			BlockPos pos,
+			IBlockState state,
+			Entity entityIn )
 	{
-		this.cb( w, x, y, z ).onEntityCollision( e );
+		this.cb( w, pos ).onEntityCollision( entityIn );
 	}
 
 	@Override
-	public int isProvidingStrongPower( IBlockAccess w, int x, int y, int z, int side )
+	public int isProvidingStrongPower(
+			IBlockAccess w,
+			BlockPos pos,
+			IBlockState state,
+			EnumFacing side )
 	{
-		return this.cb( w, x, y, z ).isProvidingStrongPower( ForgeDirection.getOrientation( side ).getOpposite() );
+		return this.cb( w, pos ).isProvidingStrongPower( side.getOpposite() );  // TODO: IS OPPOSITE!?
 	}
 
 	@Override
-	public int getLightValue( IBlockAccess world, int x, int y, int z )
+	public int getLightValue(
+			IBlockAccess world,
+			BlockPos pos )
 	{
-		Block block = world.getBlock( x, y, z );
-		if( block != null && block != this )
+		IBlockState block = world.getBlockState( pos );
+		if( block != null && block.getBlock() != this )
 		{
-			return block.getLightValue( world, x, y, z );
+			return block.getBlock().getLightValue( world, pos );
 		}
 		if( block == null )
 		{
 			return 0;
 		}
-		return this.cb( world, x, y, z ).getLightValue();
+		return this.cb( world, pos ).getLightValue();
 	}
 
 	@Override
-	public boolean isLadder( IBlockAccess world, int x, int y, int z, EntityLivingBase entity )
+	public boolean isLadder( IBlockAccess world, BlockPos pos, EntityLivingBase entity )
 	{
-		return this.cb( world, x, y, z ).isLadder( entity );
+		return this.cb( world, pos ).isLadder( entity );
 	}
 
 	@Override
-	public boolean isSideSolid( IBlockAccess w, int x, int y, int z, ForgeDirection side )
+	public boolean isSideSolid( IBlockAccess w, BlockPos pos, EnumFacing side )
 	{
-		return this.cb( w, x, y, z ).isSolidOnSide( side );
+		return this.cb( w, pos ).isSolidOnSide( side );
 	}
 
 	@Override
-	public boolean isReplaceable( IBlockAccess world, int x, int y, int z )
+	public boolean isReplaceable(
+			World w,
+			BlockPos pos )
 	{
-		return this.cb( world, x, y, z ).isEmpty();
+		return this.cb( w, pos ).isEmpty();
 	}
 
-	@SuppressWarnings( "deprecation" )
 	@Override
-	public boolean removedByPlayer( World world, EntityPlayer player, int x, int y, int z )
+	public boolean removedByPlayer(
+			World world,
+			BlockPos pos,
+			EntityPlayer player,
+			boolean willHarvest )
 	{
 		if( player.capabilities.isCreativeMode )
 		{
-			AEBaseTile tile = this.getTileEntity( world, x, y, z );
+			AEBaseTile tile = this.getTileEntity( world, pos );
 			if( tile != null )
 			{
 				tile.disableDrops();
 			}
 			// maybe ray trace?
 		}
-		return super.removedByPlayer( world, player, x, y, z );
+		return super.removedByPlayer( world, pos, player, willHarvest );
 	}
 
 	@Override
-	public boolean canConnectRedstone( IBlockAccess w, int x, int y, int z, int side )
+	public boolean canConnectRedstone(
+			IBlockAccess w,
+			BlockPos pos,
+			EnumFacing side )
 	{
-		switch( side )
-		{
-			case -1:
-			case 4:
-				return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN ) );
-			case 0:
-				return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.NORTH ) );
-			case 1:
-				return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.EAST ) );
-			case 2:
-				return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.SOUTH ) );
-			case 3:
-				return this.cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.WEST ) );
-		}
-		return false;
+		if ( side == null )
+			side = EnumFacing.UP;
+		
+		return this.cb( w, pos ).canConnectRedstone( EnumSet.of( side ) );
 	}
 
 	@Override
-	public boolean canRenderInPass( int pass )
+	public boolean canRenderInLayer(
+			EnumWorldBlockLayer layer )
 	{
-		BusRenderHelper.INSTANCE.setPass( pass );
-
 		if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
 		{
-			return true;
+			return layer == EnumWorldBlockLayer.CUTOUT || layer == EnumWorldBlockLayer.TRANSLUCENT;
 		}
 
-		return pass == 0;
+		return layer == EnumWorldBlockLayer.CUTOUT;
 	}
 
 	@Override
-	public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
+	public ItemStack getPickBlock(
+			MovingObjectPosition target,
+			World world,
+			BlockPos pos )
 	{
-		Vec3 v3 = target.hitVec.addVector( -x, -y, -z );
-		SelectedPart sp = this.cb( world, x, y, z ).selectPart( v3 );
+		Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
+		SelectedPart sp = this.cb( world, pos ).selectPart( v3 );
 
 		if( sp.part != null )
 		{
@@ -263,15 +260,17 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 	@SideOnly( Side.CLIENT )
 	public boolean addHitEffects( World world, MovingObjectPosition target, EffectRenderer effectRenderer )
 	{
-		Object object = this.cb( world, target.blockX, target.blockY, target.blockZ );
+		Object object = this.cb( world, target.getBlockPos() );
 		if( object instanceof IPartHost )
 		{
 			IPartHost host = (IPartHost) object;
 
-			for( ForgeDirection side : ForgeDirection.values() )
+			// TODO HIT EFFECTS
+			/*
+			for( AEPartLocation side : AEPartLocation.values() )
 			{
 				IPart p = host.getPart( side );
-				IIcon ico = this.getIcon( p );
+				TextureAtlasSprite ico = this.getIcon( p );
 
 				if( ico == null )
 				{
@@ -302,24 +301,29 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 					}
 				}
 			}
+			*/
 		}
 
 		return true;
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
-	public boolean addDestroyEffects( World world, int x, int y, int z, int meta, EffectRenderer effectRenderer )
+	public boolean addDestroyEffects(
+			World world,
+			BlockPos pos,
+			EffectRenderer effectRenderer )
 	{
-		Object object = this.cb( world, x, y, z );
+		Object object = this.cb( world, pos );
 		if( object instanceof IPartHost )
 		{
 			IPartHost host = (IPartHost) object;
 
-			for( ForgeDirection side : ForgeDirection.values() )
+			// TODO DESTROY EFFECTS
+			/*
+			for( AEPartLocation side : AEPartLocation.values() )
 			{
 				IPart p = host.getPart( side );
-				IIcon ico = this.getIcon( p );
+				TextureAtlasSprite ico = this.getIcon( p );
 
 				if( ico == null )
 				{
@@ -346,52 +350,28 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 					}
 				}
 			}
+			*/
 		}
 
 		return true;
 	}
 
 	@Override
-	public void onNeighborChange( IBlockAccess w, int x, int y, int z, int tileX, int tileY, int tileZ )
+	public void onNeighborBlockChange(
+			World w,
+			BlockPos pos,
+			IBlockState state,
+			Block neighborBlock )
 	{
 		if( Platform.isServer() )
 		{
-			this.cb( w, x, y, z ).onNeighborChanged();
+			this.cb( w, pos ).onNeighborChanged();
 		}
 	}
 
-	private IIcon getIcon( IPart p )
+	private ICableBusContainer cb( IBlockAccess w, BlockPos pos )
 	{
-		if( p == null )
-		{
-			return null;
-		}
-
-		try
-		{
-			IIcon ico = p.getBreakingTexture();
-			if( ico != null )
-			{
-				return ico;
-			}
-		}
-		catch( Throwable t )
-		{
-			// nothing.
-		}
-
-		ItemStack is = p.getItemStack( PartItemStack.Network );
-		if( is == null || is.getItem() == null )
-		{
-			return null;
-		}
-
-		return is.getItem().getIcon( is, 0 );
-	}
-
-	private ICableBusContainer cb( IBlockAccess w, int x, int y, int z )
-	{
-		TileEntity te = w.getTileEntity( x, y, z );
+		TileEntity te = w.getTileEntity( pos );
 		ICableBusContainer out = null;
 
 		if( te instanceof TileCableBus )
@@ -413,46 +393,38 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 	}
 
 	@Override
-	public IIcon getIcon( IBlockAccess w, int x, int y, int z, int s )
+	public boolean onActivated(
+			World w,
+			BlockPos pos,
+			EntityPlayer player,
+			EnumFacing side,
+			float hitX,
+			float hitY,
+			float hitZ )
 	{
-		return this.getIcon( s, 0 );
+		return this.cb( w, pos ).activate( player, new Vec3( hitX, hitY, hitZ ) );
 	}
 
 	@Override
-	public IIcon getIcon( int direction, int metadata )
+	public boolean recolorBlock(
+			World world,
+			BlockPos pos,
+			EnumFacing side,
+			EnumDyeColor color )
 	{
-		IIcon i = super.getIcon( direction, metadata );
-		if( i != null )
-		{
-			return i;
-		}
-
-		return ExtraBlockTextures.BlockQuartzGlassB.getIcon();
+		return this.recolorBlock( world, pos, side, color, null );
 	}
 
-	@Override
-	public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
-	{
-		return this.cb( w, x, y, z ).activate( player, Vec3.createVectorHelper( hitX, hitY, hitZ ) );
-	}
-
-	@Override
-	public void registerBlockIcons( IIconRegister iconRegistry )
-	{
-
-	}
-
-	@Override
-	public boolean recolourBlock( World world, int x, int y, int z, ForgeDirection side, int colour )
-	{
-		return this.recolourBlock( world, x, y, z, side, colour, null );
-	}
-
-	public boolean recolourBlock( World world, int x, int y, int z, ForgeDirection side, int colour, EntityPlayer who )
+	public boolean recolorBlock(
+			World world,
+			BlockPos pos,
+			EnumFacing side,
+			EnumDyeColor color,
+			EntityPlayer who )
 	{
 		try
 		{
-			return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
+			return this.cb( world, pos ).recolourBlock( side, AEColor.values()[ color.ordinal() ], who );
 		}
 		catch( Throwable ignored )
 		{}
@@ -467,9 +439,9 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 	}
 
 	@Override
-	public <T extends AEBaseTile> T getTileEntity( IBlockAccess w, int x, int y, int z )
+	public <T extends AEBaseTile> T getTileEntity( IBlockAccess w, BlockPos pos )
 	{
-		TileEntity te = w.getTileEntity( x, y, z );
+		TileEntity te = w.getTileEntity( pos );
 
 		if( noTesrTile.isInstance( te ) )
 		{
@@ -504,15 +476,13 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 		}
 	}
 
-	@Override
-	@Method( iname = "MFR" )
-	public RedNetConnectionType getConnectionType( World world, int x, int y, int z, ForgeDirection side )
-	{
-		return this.cb( world, x, y, z ).canConnectRedstone( EnumSet.allOf( ForgeDirection.class ) ) ? RedNetConnectionType.CableSingle : RedNetConnectionType.None;
-	}
-
-	public void setRenderColor( int color )
-	{
-		this.myColorMultiplier = color;
-	}
+	/*
+	 *  // TODO MFR INTEGRATION
+		@Override
+		@Method( iname = "MFR" )
+		public RedNetConnectionType getConnectionType( World world, int x, int y, int z, AEPartLocation side )
+		{
+			return this.cb( world, x, y, z ).canConnectRedstone( EnumSet.allOf( AEPartLocation.class ) ) ? RedNetConnectionType.CableSingle : RedNetConnectionType.None;
+		}
+	*/
 }

src/main/java/appeng/block/networking/BlockController.java

@@ -23,8 +23,13 @@ import java.util.EnumSet;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
 import net.minecraft.world.World;
-
 import appeng.block.AEBaseTileBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockController;
@@ -35,6 +40,45 @@ import appeng.tile.networking.TileController;
 public class BlockController extends AEBaseTileBlock
 {
 
+	public static enum ControllerBlockState implements IStringSerializable
+	{
+		OFFLINE, ONLINE, CONFLICTED;
+
+		@Override
+		public String getName()
+		{
+			return name();
+		}
+		
+	};
+
+    public static final PropertyEnum CONTROLLER_STATE = PropertyEnum.create("state",ControllerBlockState.class);
+	
+    @Override
+    protected IProperty[] getAEStates()
+    {
+    	return new IProperty[]{ CONTROLLER_STATE };
+    }
+    
+	@Override
+	public int getMetaFromState(
+			IBlockState state )
+	{
+		return ((ControllerBlockState)state.getValue( CONTROLLER_STATE )).ordinal();
+	}
+	
+	@Override
+	public IBlockState getStateFromMeta( int meta )
+	{
+		return getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.OFFLINE );
+	}
+	
+	@Override
+	public EnumWorldBlockLayer getBlockLayer()
+	{
+		return EnumWorldBlockLayer.CUTOUT;
+	}
+	
 	public BlockController()
 	{
 		super( Material.iron );
@@ -44,9 +88,13 @@ public class BlockController extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onNeighborBlockChange( World w, int x, int y, int z, Block neighborBlock )
+	public void onNeighborBlockChange(
+			World w,
+			BlockPos pos,
+			IBlockState state,
+			Block neighborBlock )
 	{
-		TileController tc = this.getTileEntity( w, x, y, z );
+		TileController tc = this.getTileEntity( w, pos );
 		if( tc != null )
 		{
 			tc.onNeighborChange( false );

src/main/java/appeng/block/networking/BlockDenseEnergyCell.java

@@ -21,8 +21,6 @@ package appeng.block.networking;
 
 import java.util.EnumSet;
 
-import net.minecraft.util.IIcon;
-
 import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.features.AEFeature;
 import appeng.tile.networking.TileDenseEnergyCell;
@@ -38,10 +36,11 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
 	}
 
 	@Override
-	public IIcon getIcon( int direction, int metadata )
+	public appeng.client.texture.IAESprite getIcon(net.minecraft.util.EnumFacing side, net.minecraft.block.state.IBlockState state)
 	{
-		switch( metadata )
+		switch( (int)state.getValue( ENERGY_STORAGE ) )
 		{
+			default:
 			case 0:
 				return ExtraBlockTextures.MEDenseEnergyCell0.getIcon();
 			case 1:
@@ -59,9 +58,8 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
 			case 7:
 				return ExtraBlockTextures.MEDenseEnergyCell7.getIcon();
 		}
-		return super.getIcon( direction, metadata );
 	}
-
+	
 	@Override
 	public double getMaxPower()
 	{

src/main/java/appeng/block/networking/BlockEnergyAcceptor.java

@@ -22,7 +22,6 @@ package appeng.block.networking;
 import java.util.EnumSet;
 
 import net.minecraft.block.material.Material;
-
 import appeng.block.AEBaseTileBlock;
 import appeng.core.features.AEFeature;
 import appeng.tile.networking.TileEnergyAcceptor;

src/main/java/appeng/block/networking/BlockEnergyCell.java

@@ -22,15 +22,15 @@ package appeng.block.networking;
 import java.util.EnumSet;
 import java.util.List;
 
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import appeng.block.AEBaseItemBlock;
 import appeng.block.AEBaseItemBlockChargeable;
 import appeng.block.AEBaseTileBlock;
@@ -46,6 +46,21 @@ import appeng.util.Platform;
 public class BlockEnergyCell extends AEBaseTileBlock
 {
 
+	public static final PropertyInteger ENERGY_STORAGE = PropertyInteger.create( "fullness", 0, 8 );
+
+	@Override
+	public int getMetaFromState(
+			IBlockState state )
+	{
+		return (int)state.getValue( ENERGY_STORAGE );
+	}
+	
+	@Override
+	public IBlockState getStateFromMeta( int meta )
+	{
+		return getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7,  Math.max( 0, meta ) ) );
+	}
+	
 	public BlockEnergyCell()
 	{
 		super( AEGlassMaterial.INSTANCE );
@@ -61,10 +76,11 @@ public class BlockEnergyCell extends AEBaseTileBlock
 	}
 
 	@Override
-	public IIcon getIcon( int direction, int metadata )
+	public appeng.client.texture.IAESprite getIcon(net.minecraft.util.EnumFacing side, IBlockState state)
 	{
-		switch( metadata )
+		switch( (int)state.getValue( ENERGY_STORAGE ) )
 		{
+			default:
 			case 0:
 				return ExtraBlockTextures.MEEnergyCell0.getIcon();
 			case 1:
@@ -82,7 +98,6 @@ public class BlockEnergyCell extends AEBaseTileBlock
 			case 7:
 				return ExtraBlockTextures.MEEnergyCell7.getIcon();
 		}
-		return super.getIcon( direction, metadata );
 	}
 
 	@Override
@@ -104,6 +119,12 @@ public class BlockEnergyCell extends AEBaseTileBlock
 		return 200000.0;
 	}
 
+	@Override
+	protected IProperty[] getAEStates()
+	{
+		return new IProperty[]{ENERGY_STORAGE};
+	}
+
 	@Override
 	public Class<? extends AEBaseItemBlock> getItemBlockClass()
 	{

src/main/java/appeng/block/networking/BlockWireless.java

@@ -23,12 +23,15 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
+import appeng.api.util.AEPartLocation;
 import appeng.block.AEBaseTileBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockWireless;
@@ -60,19 +63,33 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
+	public EnumWorldBlockLayer getBlockLayer()
 	{
-		if( p.isSneaking() )
+		return EnumWorldBlockLayer.CUTOUT;
+	}
+	
+	@Override
+	public boolean onBlockActivated(
+			World w,
+			BlockPos pos,
+			IBlockState state,
+			EntityPlayer player,
+			EnumFacing side,
+			float hitX,
+			float hitY,
+			float hitZ )
+	{
+		if( player.isSneaking() )
 		{
 			return false;
 		}
 
-		TileWireless tg = this.getTileEntity( w, x, y, z );
+		TileWireless tg = this.getTileEntity( w, pos );
 		if( tg != null )
 		{
 			if( Platform.isServer() )
 			{
-				Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_WIRELESS );
+				Platform.openGUI( player, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_WIRELESS );
 			}
 			return true;
 		}
@@ -80,12 +97,16 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+			World w,
+			BlockPos pos,
+			Entity thePlayer,
+			boolean b )
 	{
-		TileWireless tile = this.getTileEntity( w, x, y, z );
+		TileWireless tile = this.getTileEntity( w, pos );
 		if( tile != null )
 		{
-			ForgeDirection forward = tile.getForward();
+			EnumFacing forward = tile.getForward();
 
 			double minX = 0;
 			double minY = 0;
@@ -136,18 +157,23 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 					break;
 			}
 
-			return Collections.singletonList( AxisAlignedBB.getBoundingBox( minX, minY, minZ, maxX, maxY, maxZ ) );
+			return Collections.singletonList( AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ) );
 		}
-		return Collections.singletonList( AxisAlignedBB.getBoundingBox( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) );
+		return Collections.singletonList( AxisAlignedBB.fromBounds( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) );
 	}
 
 	@Override
-	public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
+	public void addCollidingBlockToList(
+			World w,
+			BlockPos pos,
+			AxisAlignedBB bb,
+			List<AxisAlignedBB> out,
+			Entity e )
 	{
-		TileWireless tile = this.getTileEntity( w, x, y, z );
+		TileWireless tile = this.getTileEntity( w, pos );
 		if( tile != null )
 		{
-			ForgeDirection forward = tile.getForward();
+			EnumFacing forward = tile.getForward();
 
 			double minX = 0;
 			double minY = 0;
@@ -198,11 +224,11 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 					break;
 			}
 
-			out.add( AxisAlignedBB.getBoundingBox( minX, minY, minZ, maxX, maxY, maxZ ) );
+			out.add( AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ) );
 		}
 		else
 		{
-			out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
+			out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
 		}
 	}
 }