From 60796cd026cc0dcd27f5d460d48db467a677b5ac Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 14 Apr 2014 02:50:40 +0100 Subject: [PATCH] A little easter egg never hurt anybody. --- .../common/item/tool/ItemManasteelSword.java | 22 ++++++++++++++---- .../botania/textures/items/elucidator.png | Bin 0 -> 4060 bytes 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 resources/assets/botania/textures/items/elucidator.png diff --git a/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java b/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java index ff63b60d3..29b97246c 100644 --- a/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java +++ b/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java @@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; @@ -28,8 +29,10 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword { -private static final int MANA_PER_DAMAGE = 50; - + private static final int MANA_PER_DAMAGE = 50; + + IIcon elucidatorIcon; + public ItemManasteelSword() { super(BotaniaAPI.manasteelToolMaterial); setCreativeTab(BotaniaCreativeTab.INSTANCE); @@ -46,14 +49,25 @@ private static final int MANA_PER_DAMAGE = 50; @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { itemIcon = IconHelper.forItem(par1IconRegister, this); + elucidatorIcon = IconHelper.forName(par1IconRegister, "elucidator"); } - + @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { ManasteelToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE); return true; } + @Override + public IIcon getIconIndex(ItemStack par1ItemStack) { + return par1ItemStack.getDisplayName().equals("The Elucidator") ? elucidatorIcon : super.getIconIndex(par1ItemStack); + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return getIconIndex(stack); + } + @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { if (block.getBlockHardness(world, x, y, z) != 0F) @@ -61,5 +75,5 @@ private static final int MANA_PER_DAMAGE = 50; return true; } - + } diff --git a/resources/assets/botania/textures/items/elucidator.png b/resources/assets/botania/textures/items/elucidator.png new file mode 100644 index 0000000000000000000000000000000000000000..4ba7421fd64f24bdef40cba0e8fd0b765d5a8e30 GIT binary patch literal 4060 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 O0000