Fixed up the Tile Entity mess a bit, still need to look at the CableBus stuff a bit though.

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

@@ -100,7 +100,6 @@ public class BlockCableBus extends AEBaseTileBlock
 
 		// this will actually be overwritten later through setupTile and the
 		// combined layers
-		this.setTileEntity( TileCableBus.class );
 	}
 
 	@Override
@@ -387,20 +386,22 @@ public class BlockCableBus extends AEBaseTileBlock
 	{
 		noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class );
 		this.setTileEntity( noTesrTile );
-		// TODO: Change after transition phase
-		Platform.registerTileEntityWithAlternatives( noTesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "BlockCableBus", "BlockCableBus" );
+
 		if( Platform.isClient() )
 		{
 			setupTesr();
 		}
+		else
+		{
+			GameRegistry.registerTileEntity( noTesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "BlockCableBus" );
+		}
 	}
 
 	@SideOnly( Side.CLIENT )
 	private static void setupTesr()
 	{
 		tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class );
-		// TODO: Change after transition phase
-		Platform.registerTileEntityWithAlternatives( tesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "ClientOnly_TESR_CableBus", "ClientOnly_TESR_CableBus" );
+		GameRegistry.registerTileEntity( tesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "ClientOnly_TESR_CableBus" );
 		ClientRegistry.bindTileEntitySpecialRenderer( BlockCableBus.getTesrTile(), new CableBusTESR() );
 	}
 

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

@@ -73,7 +73,6 @@ public class BlockController extends AEBaseTileBlock
 	public BlockController()
 	{
 		super( Material.IRON );
-		this.setTileEntity( TileController.class );
 		this.setHardness( 6 );
 		this.setDefaultState( getDefaultState()
 				.withProperty( CONTROLLER_STATE, ControllerBlockState.offline )

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

@@ -29,6 +29,5 @@ public class BlockCreativeEnergyCell extends AEBaseTileBlock
 	public BlockCreativeEnergyCell()
 	{
 		super( AEGlassMaterial.INSTANCE );
-		this.setTileEntity( TileCreativeEnergyCell.class );
 	}
 }

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

@@ -26,7 +26,7 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
 
 	public BlockDenseEnergyCell()
 	{
-		this.setTileEntity( TileDenseEnergyCell.class );
+
 	}
 
 	@Override

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

@@ -31,6 +31,5 @@ public class BlockEnergyAcceptor extends AEBaseTileBlock
 	public BlockEnergyAcceptor()
 	{
 		super( Material.IRON );
-		this.setTileEntity( TileEnergyAcceptor.class );
 	}
 }

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

@@ -56,8 +56,6 @@ public class BlockEnergyCell extends AEBaseTileBlock
 	public BlockEnergyCell()
 	{
 		super( AEGlassMaterial.INSTANCE );
-
-		this.setTileEntity( TileEnergyCell.class );
 	}
 
 	@Override

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

@@ -66,7 +66,6 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	public BlockWireless()
 	{
 		super( AEGlassMaterial.INSTANCE );
-		this.setTileEntity( TileWireless.class );
 		this.setLightOpacity( 0 );
 		this.setFullSize( false );
 		this.setOpaque( false );