Splits AEBaseBlock into AEBaseBlock + AEBaseTileBlock

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

@@ -53,7 +53,7 @@ import appeng.api.parts.IPartHost;
 import appeng.api.parts.PartItemStack;
 import appeng.api.parts.SelectedPart;
 import appeng.api.util.AEColor;
-import appeng.block.AEBaseBlock;
+import appeng.block.AEBaseTileBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BusRenderHelper;
 import appeng.client.render.blocks.RendererCableBus;
@@ -61,6 +61,7 @@ import appeng.client.texture.ExtraBlockTextures;
 import appeng.core.AEConfig;
 import appeng.core.Api;
 import appeng.core.CommonHelper;
+import appeng.core.features.AECableBusFeatureHandler;
 import appeng.core.features.AEFeature;
 import appeng.helpers.AEGlassMaterial;
 import appeng.integration.IntegrationRegistry;
@@ -77,7 +78,7 @@ import appeng.util.Platform;
 
 
 @Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR" )
-public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
+public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
 {
 
 	private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
@@ -94,6 +95,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
 		super( AEGlassMaterial.INSTANCE );
 		this.setLightOpacity( 0 );
 		this.isFullSize = this.isOpaque = false;
+
+		// this will actually be overwritten later through setupTile and the combined layers
+		this.setTileEntity( TileCableBus.class );
 		this.setFeature( EnumSet.of( AEFeature.Core ) );
 	}
 
@@ -451,8 +455,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
 			return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
 		}
 		catch( Throwable ignored )
-		{
-		}
+		{}
 		return false;
 	}
 
@@ -464,7 +467,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
 	}
 
 	@Override
-	public <T extends TileEntity> T getTileEntity( IBlockAccess w, int x, int y, int z )
+	public <T extends AEBaseTile> T getTileEntity( IBlockAccess w, int x, int y, int z )
 	{
 		TileEntity te = w.getTileEntity( x, y, z );
 
@@ -481,6 +484,13 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
 		return null;
 	}
 
+	@Override
+	protected void setFeature( EnumSet<AEFeature> f )
+	{
+		final AECableBusFeatureHandler featureHandler = new AECableBusFeatureHandler( f, this, this.featureSubName );
+		this.setHandler( featureHandler );
+	}
+
 	public void setupTile()
 	{
 		noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() );

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

@@ -25,14 +25,14 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 
-import appeng.block.AEBaseBlock;
+import appeng.block.AEBaseTileBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockController;
 import appeng.core.features.AEFeature;
 import appeng.tile.networking.TileController;
 
 
-public class BlockController extends AEBaseBlock
+public class BlockController extends AEBaseTileBlock
 {
 
 	public BlockController()

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

@@ -21,13 +21,13 @@ package appeng.block.networking;
 
 import java.util.EnumSet;
 
-import appeng.block.AEBaseBlock;
+import appeng.block.AEBaseTileBlock;
 import appeng.core.features.AEFeature;
 import appeng.helpers.AEGlassMaterial;
 import appeng.tile.networking.TileCreativeEnergyCell;
 
 
-public class BlockCreativeEnergyCell extends AEBaseBlock
+public class BlockCreativeEnergyCell extends AEBaseTileBlock
 {
 
 	public BlockCreativeEnergyCell()

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

@@ -23,12 +23,12 @@ import java.util.EnumSet;
 
 import net.minecraft.block.material.Material;
 
-import appeng.block.AEBaseBlock;
+import appeng.block.AEBaseTileBlock;
 import appeng.core.features.AEFeature;
 import appeng.tile.networking.TileEnergyAcceptor;
 
 
-public class BlockEnergyAcceptor extends AEBaseBlock
+public class BlockEnergyAcceptor extends AEBaseTileBlock
 {
 
 	public BlockEnergyAcceptor()

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

@@ -31,9 +31,9 @@ import net.minecraft.util.IIcon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import appeng.block.AEBaseBlock;
 import appeng.block.AEBaseItemBlock;
 import appeng.block.AEBaseItemBlockChargeable;
+import appeng.block.AEBaseTileBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockEnergyCube;
 import appeng.client.texture.ExtraBlockTextures;
@@ -43,7 +43,7 @@ import appeng.tile.networking.TileEnergyCell;
 import appeng.util.Platform;
 
 
-public class BlockEnergyCell extends AEBaseBlock
+public class BlockEnergyCell extends AEBaseTileBlock
 {
 
 	public BlockEnergyCell()

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

@@ -29,7 +29,7 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import appeng.block.AEBaseBlock;
+import appeng.block.AEBaseTileBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockWireless;
 import appeng.core.features.AEFeature;
@@ -40,7 +40,7 @@ import appeng.tile.networking.TileWireless;
 import appeng.util.Platform;
 
 
-public class BlockWireless extends AEBaseBlock implements ICustomCollision
+public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 {
 
 	public BlockWireless()