From 4b8b13b34d7a8fd0ee7c7b13f11be9c2bf3b5d18 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Tue, 15 Apr 2014 22:41:43 +0300 Subject: More 1.7 stuff --- .../darkknight/jewelrycraft/block/BlockShadow.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockShadow.java') diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockShadow.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockShadow.java index 77b2051..acce92f 100644 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockShadow.java +++ b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockShadow.java @@ -1,5 +1,7 @@ package darkknight.jewelrycraft.block; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -17,6 +19,7 @@ import darkknight.jewelrycraft.tileentity.TileEntityBlockShadow; public class BlockShadow extends BlockContainer { private IIcon[] iconArray; + private static final String __OBFID = "CL_00000312"; public BlockShadow() { @@ -60,7 +63,7 @@ public class BlockShadow extends BlockContainer return new TileEntityBlockShadow(); } - public void registerIcons(IIconRegister par1IconRegister) + public void registerBlockIcons(IIconRegister par1IconRegister) { this.iconArray = new IIcon[16]; @@ -87,11 +90,6 @@ public class BlockShadow extends BlockContainer if (this == BlockList.shadowBlock) { - if (p_149646_1_.getBlockMetadata(p_149646_2_, p_149646_3_, p_149646_4_) != p_149646_1_.getBlockMetadata(p_149646_2_ - Facing.offsetsXForSide[p_149646_5_], p_149646_3_ - Facing.offsetsYForSide[p_149646_5_], p_149646_4_ - Facing.offsetsZForSide[p_149646_5_])) - { - return true; - } - if (block == this) { return false; @@ -110,4 +108,10 @@ public class BlockShadow extends BlockContainer { return world.getBlockMetadata(x, y, z); } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) + { + return this.iconArray[meta]; + } } -- cgit v1.2.3