From 82d1d18d7658166336c50c4eb24c0cb82bdebb77 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 29 Oct 2014 21:49:22 +0000 Subject: [PATCH] Manasteel tools repair. --- .../item/equipment/tool/manasteel/ItemManasteelAxe.java | 9 +++++++++ .../item/equipment/tool/manasteel/ItemManasteelPick.java | 9 +++++++++ .../equipment/tool/manasteel/ItemManasteelShears.java | 9 +++++++++ .../equipment/tool/manasteel/ItemManasteelShovel.java | 9 +++++++++ .../equipment/tool/manasteel/ItemManasteelSword.java | 9 +++++++++ 5 files changed, 45 insertions(+) diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 1cf727bc3..0a18cb0a8 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -13,13 +13,16 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -74,6 +77,12 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem { return true; } + + @Override + public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { + if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + stack.setItemDamage(stack.getItemDamage() - 1); + } @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index bed091e4a..8d0053cf9 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -13,13 +13,16 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -79,6 +82,12 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem { return MANA_PER_DAMAGE; } + @Override + public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { + if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + stack.setItemDamage(stack.getItemDamage() - 1); + } + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index ac8bed260..124740cd5 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -18,6 +18,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -25,8 +26,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; +import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -125,6 +128,12 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { return false; } + @Override + public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { + if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + stack.setItemDamage(stack.getItemDamage() - 1); + } + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 1913cefe0..56d923b94 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -13,13 +13,16 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -74,6 +77,12 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem { return true; } + + @Override + public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { + if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + stack.setItemDamage(stack.getItemDamage() - 1); + } @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index da269b592..c10f5ad64 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -13,7 +13,9 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; @@ -21,6 +23,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -90,6 +93,12 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { return true; } + @Override + public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { + if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + stack.setItemDamage(stack.getItemDamage() - 1); + } + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);