From abf5d9672b5829e427c99cdb90e1a938b97f9dd4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 28 Apr 2016 23:34:40 -0500 Subject: [PATCH] Make some items use new cooldowns, closes #261 --- .../vazkii/botania/common/item/ItemSignalFlare.java | 9 ++++----- .../vazkii/botania/common/item/rod/ItemFireRod.java | 11 ++++++----- .../botania/common/item/rod/ItemRainbowRod.java | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 96b76e6ba..4e2366186 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -43,12 +43,11 @@ public class ItemSignalFlare extends ItemMod implements IColorable { super(LibItemNames.SIGNAL_FLARE); setMaxStackSize(1); setNoRepair(); - setMaxDamage(200); } @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(par1ItemStack.getItemDamage() == 0) { + if(!par3EntityPlayer.getCooldownTracker().hasCooldown(this)) { if(par2World.isRemote) par3EntityPlayer.swingArm(hand); else { @@ -71,7 +70,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { if(stunned >= 100) par3EntityPlayer.addStat(ModAchievements.signalFlareStun, 1); } - par1ItemStack.damageItem(200, par3EntityPlayer); + par3EntityPlayer.getCooldownTracker().setCooldown(this, 200); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -80,8 +79,8 @@ public class ItemSignalFlare extends ItemMod implements IColorable { @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + if(par1ItemStack.getItemDamage() > 0) + par1ItemStack.setItemDamage(0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index eefba895e..2df39bc4f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -42,17 +42,17 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield public ItemFireRod() { super(LibItemNames.FIRE_ROD); setMaxStackSize(1); - setMaxDamage(COOLDOWN); } @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(!par3World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { + if(!par3World.isRemote && !player.getCooldownTracker().hasCooldown(this) && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(player.worldObj); entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); player.worldObj.spawnEntityInWorld(entity); - par1ItemStack.setItemDamage(COOLDOWN); + player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.Helper.hasProficiency(player) ? COOLDOWN / 2 : COOLDOWN); + ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); par3World.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_blaze_ambient, SoundCategory.PLAYERS, 1F, 1F); } @@ -62,8 +62,9 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged() && par3Entity instanceof EntityPlayer) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - (IManaProficiencyArmor.Helper.hasProficiency((EntityPlayer) par3Entity) ? 2 : 1)); + // Keep for backward compat + if(par1ItemStack.getItemDamage() > 0) + par1ItemStack.setItemDamage(0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 8e82976c5..d7e242e2a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -52,13 +52,12 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi public ItemRainbowRod() { super(LibItemNames.RAINBOW_ROD); - setMaxDamage(TIME); setMaxStackSize(1); } @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(!par2World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { + if(!par2World.isRemote && !par3EntityPlayer.getCooldownTracker().hasCooldown(this) && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); @@ -108,7 +107,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi if(count > 0) { par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false); - par1ItemStack.setItemDamage(TIME); + par3EntityPlayer.getCooldownTracker().setCooldown(this, TIME); } } @@ -127,8 +126,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + // Kept for backward compat + if (par1ItemStack.getItemDamage() > 0) + par1ItemStack.setItemDamage(0); } @Override