Splits AEBaseBlock into AEBaseBlock + AEBaseTileBlock

src/main/java/appeng/block/misc/BlockLightDetector.java

@@ -19,24 +19,45 @@
 package appeng.block.misc;
 
 
+import java.util.Collections;
 import java.util.EnumSet;
+import java.util.List;
 import java.util.Random;
 
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+import appeng.api.util.IOrientable;
+import appeng.api.util.IOrientableBlock;
+import appeng.block.AEBaseTileBlock;
+import appeng.client.render.BaseBlockRender;
+import appeng.client.render.blocks.RenderQuartzTorch;
 import appeng.core.features.AEFeature;
+import appeng.helpers.ICustomCollision;
+import appeng.helpers.MetaRotation;
 import appeng.tile.misc.TileLightDetector;
 
 
-public class BlockLightDetector extends BlockQuartzTorch
+public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision
 {
 
 	public BlockLightDetector()
 	{
+		super( Material.circuits );
+
+		this.setLightLevel( 0.9375F );
+		this.setLightOpacity( 0 );
+		this.isFullSize = false;
+		this.isOpaque = false;
+
 		this.setTileEntity( TileLightDetector.class );
 		this.setFeature( EnumSet.of( AEFeature.LightDetector ) );
 	}
@@ -70,4 +91,82 @@ public class BlockLightDetector extends BlockQuartzTorch
 	{
 		// cancel out lightning
 	}
+
+	@Override
+	protected Class<? extends RenderQuartzTorch> getRenderer()
+	{
+		return RenderQuartzTorch.class;
+	}
+
+	@Override
+	public boolean isValidOrientation( World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up )
+	{
+		return this.canPlaceAt( w, x, y, z, up.getOpposite() );
+	}
+
+	private boolean canPlaceAt( World w, int x, int y, int z, ForgeDirection dir )
+	{
+		return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
+	}
+
+	@Override
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
+	{
+		ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
+		double xOff = -0.3 * up.offsetX;
+		double yOff = -0.3 * up.offsetY;
+		double zOff = -0.3 * up.offsetZ;
+		return Collections.singletonList( AxisAlignedBB.getBoundingBox( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) );
+	}
+
+	@Override
+	public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e )
+	{/*
+	 * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; double zOff = -0.15 *
+	 * getUp().offsetZ; out.add( AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + (double) y + 0.15, zOff
+	 * + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
+	 */
+	}
+
+	@Override
+	public void onNeighborBlockChange( World w, int x, int y, int z, Block id )
+	{
+		ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
+		if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
+		{
+			this.dropTorch( w, x, y, z );
+		}
+	}
+
+	private void dropTorch( World w, int x, int y, int z )
+	{
+		w.func_147480_a( x, y, z, true );
+		// w.destroyBlock( x, y, z, true );
+		w.markBlockForUpdate( x, y, z );
+	}
+
+	@Override
+	public boolean canPlaceBlockAt( World w, int x, int y, int z )
+	{
+		for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
+		{
+			if( this.canPlaceAt( w, x, y, z, dir ) )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean usesMetadata()
+	{
+		return true;
+	}
+
+	@Override
+	public IOrientable getOrientable( final IBlockAccess w, final int x, final int y, final int z )
+	{
+		return new MetaRotation( w, x, y, z );
+	}
 }