Merge pull request #243 from yueh/fix-242

Prevent matrix frames from being placeable
This commit is contained in:
thatsIch 2014-10-04 15:00:26 +02:00
commit c6bc0b36ef

View file

@ -4,8 +4,6 @@ import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -20,12 +18,15 @@ import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderNull; import appeng.client.render.blocks.RenderNull;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.helpers.ICustomCollision; import appeng.helpers.ICustomCollision;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
{ {
public BlockMatrixFrame() { public BlockMatrixFrame()
super( BlockMatrixFrame.class, Material.anvil); {
super( BlockMatrixFrame.class, Material.anvil );
setFeature( EnumSet.of( AEFeature.SpatialIO ) ); setFeature( EnumSet.of( AEFeature.SpatialIO ) );
setResistance( 6000000.0F ); setResistance( 6000000.0F );
setBlockUnbreakable(); setBlockUnbreakable();
@ -71,4 +72,10 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
} }
@Override
public boolean canPlaceBlockAt(World world, int x, int y, int z)
{
return false;
}
} }