From 6bebc6a1956de40a68b50246b2b96182182fb5cd Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Mon, 17 Aug 2015 23:32:40 -0700 Subject: [PATCH] Unbreakable Fixes #21 --- .../avaritia/blocks/BlockCrystalMatrix.java | 9 +++++-- .../avaritia/blocks/BlockResource.java | 25 +++++++------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java index b3d160f..32bd638 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java @@ -3,6 +3,7 @@ package fox.spiteful.avaritia.blocks; import fox.spiteful.avaritia.Avaritia; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; import net.minecraft.world.IBlockAccess; public class BlockCrystalMatrix extends Block { @@ -19,9 +20,13 @@ public class BlockCrystalMatrix extends Block { } @Override - public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) - { + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ){ return true; } + @Override + public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity){ + return false; + } + } diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java index c296128..8072b0f 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,37 +31,25 @@ public class BlockResource extends Block { setCreativeTab(Avaritia.tab); } - /** - * Gets the block's texture. Args: side, meta - */ @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { return this.icons[metadata % types.length]; } - /** - * Determines the damage on the item the block drops. Used in cloth and wood. - */ public int damageDropped(int metadata) { return metadata; } - /** - * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) - */ - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) - { + public void getSubBlocks(Item item, CreativeTabs tab, List list){ for(int x = 0;x < types.length;x++) list.add(new ItemStack(item, 1, x)); } @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister){ this.icons = new IIcon[types.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -69,8 +58,12 @@ public class BlockResource extends Block { } @Override - public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) - { + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ){ return true; } + + @Override + public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity){ + return false; + } }