Splits AEBaseBlock into AEBaseBlock + AEBaseTileBlock

src/main/java/appeng/core/features/AEBlockFeatureHandler.java

@@ -25,7 +25,7 @@ import com.google.common.base.Optional;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
-import appeng.api.definitions.ITileDefinition;
+import appeng.api.definitions.IBlockDefinition;
 import appeng.block.AEBaseBlock;
 import appeng.core.CommonHelper;
 import appeng.core.CreativeTab;
@@ -37,7 +37,7 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
 	private final AEBaseBlock featured;
 	private final FeatureNameExtractor extractor;
 	private final boolean enabled;
-	private final TileDefinition definition;
+	private final BlockDefinition definition;
 
 	public AEBlockFeatureHandler( EnumSet<AEFeature> features, AEBaseBlock featured, Optional<String> subName )
 	{
@@ -46,7 +46,7 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
 		this.featured = featured;
 		this.extractor = new FeatureNameExtractor( featured.getClass(), subName );
 		this.enabled = state == ActivityState.Enabled;
-		this.definition = new TileDefinition( featured, state );
+		this.definition = new BlockDefinition( featured, state );
 	}
 
 	@Override
@@ -56,7 +56,7 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
 	}
 
 	@Override
-	public ITileDefinition getDefinition()
+	public IBlockDefinition getDefinition()
 	{
 		return this.definition;
 	}
@@ -71,23 +71,11 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
 			this.featured.setBlockName( /* "tile." */"appliedenergistics2." + name );
 			this.featured.setBlockTextureName( "appliedenergistics2:" + name );
 
-			if( Platform.isClient() )
-			{
-				CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured );
-			}
-
-			// Class<? extends AEBaseItemBlock> itemBlockClass = this.featured.getItemBlockClass();
-
 			final String registryName = "tile." + name;
 
 			// Bypass the forge magic with null to register our own itemblock later.
 			GameRegistry.registerBlock( this.featured, null, registryName );
 			GameRegistry.registerItem( this.definition.maybeItem().get(), registryName );
-
-			if( !this.featured.toString().equals( "BlockCableBus" ) )
-			{
-				GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() );
-			}
 		}
 	}
 }

src/main/java/appeng/core/features/AECableBusFeatureHandler.java

@@ -0,0 +1,92 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.core.features;
+
+
+import java.util.EnumSet;
+
+import com.google.common.base.Optional;
+
+import net.minecraft.tileentity.TileEntity;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+import appeng.api.definitions.ITileDefinition;
+import appeng.block.AEBaseTileBlock;
+import appeng.block.networking.BlockCableBus;
+import appeng.core.CommonHelper;
+import appeng.core.CreativeTab;
+import appeng.util.Platform;
+
+
+public final class AECableBusFeatureHandler implements IFeatureHandler
+{
+	private final AEBaseTileBlock featured;
+	private final FeatureNameExtractor extractor;
+	private final boolean enabled;
+	private final TileDefinition definition;
+
+	public AECableBusFeatureHandler( EnumSet<AEFeature> features, BlockCableBus featured, Optional<String> subName )
+	{
+		final ActivityState state = new FeaturedActiveChecker( features ).getActivityState();
+
+		this.featured = featured;
+		this.extractor = new FeatureNameExtractor( featured.getClass(), subName );
+		this.enabled = state == ActivityState.Enabled;
+		this.definition = new TileDefinition( featured, state );
+	}
+
+	@Override
+	public boolean isFeatureAvailable()
+	{
+		return this.enabled;
+	}
+
+	@Override
+	public ITileDefinition getDefinition()
+	{
+		return this.definition;
+	}
+
+	/**
+	 * Registration of the {@link TileEntity} will actually be handled by {@link BlockCableBus#setupTile()}.
+	 */
+	@Override
+	public void register()
+	{
+		if( this.enabled )
+		{
+			String name = this.extractor.get();
+			this.featured.setCreativeTab( CreativeTab.instance );
+			this.featured.setBlockName( /* "tile." */"appliedenergistics2." + name );
+			this.featured.setBlockTextureName( "appliedenergistics2:" + name );
+
+			if( Platform.isClient() )
+			{
+				CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured );
+			}
+
+			final String registryName = "tile." + name;
+
+			// Bypass the forge magic with null to register our own itemblock later.
+			GameRegistry.registerBlock( this.featured, null, registryName );
+			GameRegistry.registerItem( this.definition.maybeItem().get(), registryName );
+		}
+	}
+}

src/main/java/appeng/core/features/AETileBlockFeatureHandler.java

@@ -0,0 +1,87 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.core.features;
+
+
+import java.util.EnumSet;
+
+import com.google.common.base.Optional;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+import appeng.api.definitions.ITileDefinition;
+import appeng.block.AEBaseTileBlock;
+import appeng.core.CommonHelper;
+import appeng.core.CreativeTab;
+import appeng.util.Platform;
+
+
+public final class AETileBlockFeatureHandler implements IFeatureHandler
+{
+	private final AEBaseTileBlock featured;
+	private final FeatureNameExtractor extractor;
+	private final boolean enabled;
+	private final TileDefinition definition;
+
+	public AETileBlockFeatureHandler( EnumSet<AEFeature> features, AEBaseTileBlock featured, Optional<String> subName )
+	{
+		final ActivityState state = new FeaturedActiveChecker( features ).getActivityState();
+
+		this.featured = featured;
+		this.extractor = new FeatureNameExtractor( featured.getClass(), subName );
+		this.enabled = state == ActivityState.Enabled;
+		this.definition = new TileDefinition( featured, state );
+	}
+
+	@Override
+	public boolean isFeatureAvailable()
+	{
+		return this.enabled;
+	}
+
+	@Override
+	public ITileDefinition getDefinition()
+	{
+		return this.definition;
+	}
+
+	@Override
+	public void register()
+	{
+		if( this.enabled )
+		{
+			String name = this.extractor.get();
+			this.featured.setCreativeTab( CreativeTab.instance );
+			this.featured.setBlockName( /* "tile." */"appliedenergistics2." + name );
+			this.featured.setBlockTextureName( "appliedenergistics2:" + name );
+
+			if( Platform.isClient() )
+			{
+				CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured );
+			}
+
+			final String registryName = "tile." + name;
+
+			// Bypass the forge magic with null to register our own itemblock later.
+			GameRegistry.registerBlock( this.featured, null, registryName );
+			GameRegistry.registerItem( this.definition.maybeItem().get(), registryName );
+			GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() );
+		}
+	}
+}

src/main/java/appeng/core/features/TileDefinition.java

@@ -25,21 +25,20 @@ import com.google.common.base.Preconditions;
 import net.minecraft.tileentity.TileEntity;
 
 import appeng.api.definitions.ITileDefinition;
-import appeng.block.AEBaseBlock;
+import appeng.block.AEBaseTileBlock;
 
 
 public final class TileDefinition extends BlockDefinition implements ITileDefinition
 {
-	private final AEBaseBlock block;
+	private final AEBaseTileBlock block;
 
-	public TileDefinition( AEBaseBlock block, ActivityState state )
+	public TileDefinition( AEBaseTileBlock block, ActivityState state )
 	{
 		super( block, state );
 
 		Preconditions.checkNotNull( block );
 		Preconditions.checkNotNull( state );
-
-		Preconditions.checkState( !block.hasBlockTileEntity() || block.getTileEntityClass() != null );
+		Preconditions.checkNotNull( block.getTileEntityClass() );
 
 		this.block = block;
 	}