From 814fc1fb23664bcdc3620f8b097bd641bd9dda78 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 26 Apr 2014 04:42:59 +0800 Subject: [PATCH] Anvil stuff starting to take shape. --- resources/assets/enderio/lang/en_US.lang | 3 +- src/main/java/crazypants/enderio/Config.java | 2 +- .../item/darksteel/AbstractUpgrade.java | 13 ++- .../enderio/item/darksteel/EnergyUpgrade.java | 108 ++++++++++++++++-- .../item/darksteel/ItemDarkSteelArmor.java | 36 +----- .../item/darksteel/ItemDarkSteelPickaxe.java | 57 +++++---- .../item/darksteel/ItemDarkSteelSword.java | 61 ++++++---- 7 files changed, 194 insertions(+), 86 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 6d277cdb..dc03842f 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -238,7 +238,8 @@ enderio.item.tooltip.power=Power: enderio.item.tooltip.showDetails= enderio.item.darkSteel.tooltip.power=Power: enderio.item.darkSteel.tooltip.durability=Durability: -enderio.item.darkSteel.tooltip.line1=Half durability damage absorbed by power. +enderio.item.darkSteel.tooltip.line1=Half durability damage absorbed +enderio.item.darkSteel.tooltip.line2=by power. enderio.item.darkSteel_pickaxe.tooltip.effPowered=Efficiency when powered enderio.item.darkSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index 6a39e8fc..89537b6d 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -80,7 +80,7 @@ public final class Config { public static int enderIoRange = 8; public static boolean enderIoMeAccessEnabled = true; - public static int darkSteelPowerStorageBase = 50000; + public static int darkSteelPowerStorageBase = 100000; public static int darkSteelPowerStorageLevelOne = 150000; public static int darkSteelPowerStorageLevelTwo = 250000; public static int darkSteelPowerStorageLevelThree = 500000; diff --git a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java index 17153c0a..81703a8e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.util.ItemUtil; @@ -18,13 +19,19 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade { public static final String KEY_UPGRADE_PREFIX = "eio.darksteel.upgrade."; + public static void addUpgardeTitle(List list, IDarkSteelUpgrade upgrade) { + //list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(upgrade.getUnlocalizedName()) + ":"); + list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(upgrade.getUnlocalizedName())); + //list.add(Lang.localize(upgrade.getUnlocalizedName()) + ":"); + } + protected final int levelCost; protected final String id; protected final String unlocName; protected AbstractUpgrade(String id, String unlocName, int levelCost) { this.levelCost = levelCost; - this.id = KEY_UPGRADE_PREFIX + id; + this.id = KEY_UPGRADE_PREFIX + id; this.unlocName = unlocName; } @@ -42,7 +49,7 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade { @Override @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(Lang.localize(unlocName)); + list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(unlocName)); } @Override @@ -91,7 +98,7 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade { if(!hasUpgrade(stack)) { return null; } - return (NBTTagCompound)stack.stackTagCompound.getTag(id); + return (NBTTagCompound) stack.stackTagCompound.getTag(id); } public abstract void writeUpgradeToNBT(NBTTagCompound upgradeRoot); diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index b6686efe..2a75cb85 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -5,16 +5,19 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Material; +import crazypants.util.Lang; public class EnergyUpgrade extends AbstractUpgrade { public static final EnergyUpgrade VIBRANT = new EnergyUpgrade( - "darksteel.upgrade.vibrant",Config.darkSteelUpgradeVibrantCost, + "darksteel.upgrade.vibrant", Config.darkSteelUpgradeVibrantCost, new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()), Config.darkSteelPowerStorageBase, Config.darkSteelPowerStorageBase / 100) { @@ -26,19 +29,19 @@ public class EnergyUpgrade extends AbstractUpgrade { }; public static final EnergyUpgrade ENERGY_ONE = new EnergyUpgrade( - "darksteel.upgrade.energy_one",Config.darkSteelUpgradePowerOneCost, + "darksteel.upgrade.energy_one", Config.darkSteelUpgradePowerOneCost, new ItemStack(EnderIO.itemBasicCapacitor, 1, 0), Config.darkSteelPowerStorageLevelOne, Config.darkSteelPowerStorageLevelOne / 100); public static final EnergyUpgrade ENERGY_TWO = new EnergyUpgrade( - "darksteel.upgrade.energy_two",Config.darkSteelUpgradePowerTwoCost, + "darksteel.upgrade.energy_two", Config.darkSteelUpgradePowerTwoCost, new ItemStack(EnderIO.itemBasicCapacitor, 1, 1), Config.darkSteelPowerStorageLevelTwo, Config.darkSteelPowerStorageLevelTwo / 100); public static final EnergyUpgrade ENERGY_THREE = new EnergyUpgrade( - "darksteel.upgrade.energy_three",Config.darkSteelUpgradePowerThreeCost, + "darksteel.upgrade.energy_three", Config.darkSteelUpgradePowerThreeCost, new ItemStack(EnderIO.itemBasicCapacitor, 1, 2), Config.darkSteelPowerStorageLevelThree, Config.darkSteelPowerStorageLevelThree / 100); @@ -49,6 +52,7 @@ public class EnergyUpgrade extends AbstractUpgrade { private static final String KEY_ABS_WITH_POWER = "absDamWithPower"; private static final String KEY_MAX_IN = "maxInput"; private static final String KEY_MAX_OUT = "maxOuput"; + private static final String KEY_UPGRADE_ITEM = "upgradeItem"; public static EnergyUpgrade loadFromItem(ItemStack stack) { if(stack == null) { @@ -67,6 +71,76 @@ public class EnergyUpgrade extends AbstractUpgrade { return loadFromItem(itemstack) != null; } + public static void addNextUpgradeTooltip(ItemStack stack, EntityPlayer entityplayer, List list, boolean flag) { + EnergyUpgrade up = loadFromItem(stack); + up = next(up); + if(up != null) { + list.add(EnumChatFormatting.YELLOW + "Anvil Upgrades: "); + list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " <" + Lang.localize(up.getUnlocalizedName()) + ": " + + up.upgradeItem.getDisplayName() + " + " + up.levelCost + " lvs>"); + } + } + + public static EnergyUpgrade next(EnergyUpgrade upgrade) { + if(upgrade == null) { + return VIBRANT; + } else if(upgrade.unlocName.equals(VIBRANT.unlocName)) { + return ENERGY_ONE; + } else if(upgrade.unlocName.equals(ENERGY_ONE.unlocName)) { + return ENERGY_TWO; + } else if(upgrade.unlocName.equals(ENERGY_TWO.unlocName)) { + return ENERGY_THREE; + } + return null; + } + + public static int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if(eu == null) { + return 0; + } + int res = eu.extractEnergy(maxExtract, simulate); + if(!simulate && res > 0) { + eu.writeToItem(container); + } + return res; + } + + public static int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if(eu == null) { + return 0; + } + int res = eu.receiveEnergy(maxReceive, simulate); + if(!simulate && res > 0) { + eu.writeToItem(container); + } + return res; + } + + public static int getEnergyStored(ItemStack container) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if(eu == null) { + return 0; + } + return eu.getEnergy(); + } + + public static int getMaxEnergyStored(ItemStack container) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if(eu == null) { + return 0; + } + return eu.getCapacity(); + } + + public static void addVibrantTooltip(List list, ItemStack itemstack) { + list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); + AbstractUpgrade.addUpgardeTitle(list, EnergyUpgrade.VIBRANT); + list.add(EnumChatFormatting.ITALIC + Lang.localize("item.darkSteel.tooltip.line1")); + list.add(EnumChatFormatting.ITALIC + Lang.localize("item.darkSteel.tooltip.line2")); + } + protected int capacity; protected int energy; protected boolean absorbDamageWithPower; @@ -91,6 +165,9 @@ public class EnergyUpgrade extends AbstractUpgrade { absorbDamageWithPower = tag.getBoolean(KEY_ABS_WITH_POWER); maxInRF = tag.getInteger(KEY_MAX_IN); maxOutRF = tag.getInteger(KEY_MAX_OUT); + if(tag.hasKey(KEY_UPGRADE_ITEM)) { + upgradeItem = ItemStack.loadItemStackFromNBT((NBTTagCompound) tag.getTag(KEY_UPGRADE_ITEM)); + } } @Override @@ -98,7 +175,7 @@ public class EnergyUpgrade extends AbstractUpgrade { if(stack == null || stack.getItem() == null) { return false; } - return stack.isItemEqual(upgradeItem); + return stack.isItemEqual(upgradeItem) && stack.stackSize == upgradeItem.stackSize; } @Override @@ -122,12 +199,20 @@ public class EnergyUpgrade extends AbstractUpgrade { @Override @SideOnly(Side.CLIENT) public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!unlocName.equals(VIBRANT.unlocName)) { - VIBRANT.addCommonEntries(itemstack, entityplayer, list, flag); - } super.addCommonEntries(itemstack, entityplayer, list, flag); } + + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if(!unlocName.equals(VIBRANT.unlocName)) { + VIBRANT.addBasicEntries(itemstack, entityplayer, list, flag); + } + super.addBasicEntries(itemstack, entityplayer, list, flag); + } + @Override public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { upgradeRoot.setInteger(KEY_CAPACITY, capacity); @@ -135,6 +220,11 @@ public class EnergyUpgrade extends AbstractUpgrade { upgradeRoot.setBoolean(KEY_ABS_WITH_POWER, absorbDamageWithPower); upgradeRoot.setInteger(KEY_MAX_IN, maxInRF); upgradeRoot.setInteger(KEY_MAX_OUT, maxOutRF); + NBTTagCompound itemRoot = new NBTTagCompound(); + if(upgradeItem != null) { + upgradeItem.writeToNBT(itemRoot); + upgradeRoot.setTag(KEY_UPGRADE_ITEM, itemRoot); + } } public boolean isAbsorbDamageWithPower() { @@ -183,4 +273,6 @@ public class EnergyUpgrade extends AbstractUpgrade { return up.unlocName.equals(unlocName); } + + } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 8785a208..2ac37996 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -18,7 +18,6 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; @@ -90,8 +89,9 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { list.add(ItemUtil.getDurabilityString(itemstack)); if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); + EnergyUpgrade.addVibrantTooltip(list, itemstack); } + EnergyUpgrade.addNextUpgradeTooltip(itemstack, entityplayer, list, flag); AnvilRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } @@ -152,46 +152,22 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - int res = eu.receiveEnergy(maxReceive, simulate); - if(!simulate && res > 0) { - eu.writeToItem(container); - } - return res; + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); } @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - int res = eu.extractEnergy(maxExtract, simulate); - if(!simulate && res > 0) { - eu.writeToItem(container); - } - return res; + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); } @Override public int getEnergyStored(ItemStack container) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - return eu.getEnergy(); + return EnergyUpgrade.getEnergyStored(container); } @Override public int getMaxEnergyStored(ItemStack container) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - return eu.getCapacity(); + return EnergyUpgrade.getMaxEnergyStored(container); } //Idea from Mekanism diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 577d94c3..033989c9 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -23,7 +23,7 @@ import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; import crazypants.util.Lang; -public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider { +public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { public static boolean isEquipped(EntityPlayer player) { if(player == null) { @@ -50,8 +50,6 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return res; } - private EnergyContainer energyCont = new EnergyContainer(Config.darkSteelPowerStorageBase, Config.darkSteelPowerStorageBase / 10, Config.darkSteelPowerStorageBase / 10); - public ItemDarkSteelPickaxe() { super(ItemDarkSteelSword.MATERIAL); setCreativeTab(EnderIOTab.tabEnderIO); @@ -95,13 +93,22 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } private void applyDamage(EntityLivingBase entity, ItemStack item, int damage) { - boolean absorbWithPower = energyCont.isAbsorbDamageWithPower(item); - if(getEnergyStored(item) > 0 && absorbWithPower) { - extractEnergy(item, Config.darkSteelPickPowerUsePerDamagePoint * damage, false); + + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(item); + if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) { + eu.extractEnergy(damage * Config.darkSteelPickPowerUsePerDamagePoint, false); + } else { - item.damageItem(damage, entity); + damage = item.getItemDamage() + damage; + if(damage >= getMaxDamage()) { + item.stackSize = 0; + } + item.setItemDamage(damage); + } + if(eu != null) { + eu.setAbsorbDamageWithPower(!eu.isAbsorbDamageWithPower()); + eu.writeToItem(item); } - energyCont.setAbsorbDamageWithPower(item, !absorbWithPower); } @@ -116,7 +123,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine @Override public float getDigSpeed(ItemStack stack, Block block, int meta) { if(ForgeHooks.isToolEffective(stack, block, meta)) { - if(Config.darkSteelPickPowerUsePerDamagePoint > 0 && energyCont.getEnergyStored(stack) > 0) { + if(Config.darkSteelPickPowerUsePerDamagePoint > 0 && getEnergyStored(stack) > 0) { return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + Config.darkSteelPickEffeciencyBoostWhenPowered; } return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial(); @@ -130,22 +137,22 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - return energyCont.receiveEnergy(container, maxReceive, simulate); + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); } @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - return energyCont.extractEnergy(container, maxExtract, simulate); + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); } @Override public int getEnergyStored(ItemStack container) { - return energyCont.getEnergyStored(container); + return EnergyUpgrade.getEnergyStored(container); } @Override public int getMaxEnergyStored(ItemStack container) { - return energyCont.getMaxEnergyStored(container); + return EnergyUpgrade.getMaxEnergyStored(container); } @Override @@ -155,22 +162,30 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + AnvilRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); } @Override public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(ItemUtil.getDurabilityString(itemstack)); - list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); + AnvilRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); } @Override public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(Lang.localize("item.darkSteel.tooltip.line1")); - list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " " + Lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); - list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyObsidian + " " + Lang.localize("item.darkSteel_pickaxe.tooltip.effObs") + " "); - list.add(EnumChatFormatting.BLUE + " (cost " - + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian / 10) + " " - + PowerDisplayUtil.abrevation() + ")"); + + list.add(ItemUtil.getDurabilityString(itemstack)); + if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + EnergyUpgrade.addVibrantTooltip(list, itemstack); + list.add(EnumChatFormatting.ITALIC + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " " + + Lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + list.add(EnumChatFormatting.ITALIC + "+" + Config.darkSteelPickEffeciencyObsidian + " " + + Lang.localize("item.darkSteel_pickaxe.tooltip.effObs") + " "); + list.add(EnumChatFormatting.ITALIC + " (cost " + + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian / 10) + " " + + PowerDisplayUtil.abrevation() + ")"); + } + EnergyUpgrade.addNextUpgradeTooltip(itemstack, entityplayer, list, flag); + AnvilRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } public ItemStack createItemStack() { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index df804e8f..f129d463 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -24,13 +24,12 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; import crazypants.util.Lang; import crazypants.util.Util; -public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerItem, IAdvancedTooltipProvider { +public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("darkSteel", 3, 1561, 7, 2, 25); @@ -61,8 +60,6 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte private int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses(); - private EnergyContainer energyCont = new EnergyContainer(Config.darkSteelPowerStorageBase, Config.darkSteelPowerStorageBase / 10, Config.darkSteelPowerStorageBase / 10); - public ItemDarkSteelSword() { super(MATERIAL); setCreativeTab(EnderIOTab.tabEnderIO); @@ -173,44 +170,55 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase entity, EntityLivingBase playerEntity) { if(playerEntity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) playerEntity; ItemStack sword = player.getCurrentEquippedItem(); - boolean absorbPower = energyCont.isAbsorbDamageWithPower(sword); - if(isEquippedAndPowered(player, powerPerDamagePoint) && absorbPower) { - extractEnergy(player.getCurrentEquippedItem(), powerPerDamagePoint, false); + + //Durability damage + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(par1ItemStack); + if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) { + eu.extractEnergy(powerPerDamagePoint, false); + } else { super.hitEntity(par1ItemStack, entity, playerEntity); } - energyCont.setAbsorbDamageWithPower(sword, !absorbPower); - if(isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) { - extractEnergy(player.getCurrentEquippedItem(), Config.darkSteelSwordPowerUsePerHit, false); - if(entity instanceof EntityEnderman) { - entity.getEntityData().setBoolean("hitByDarkSteelSword", true); + //sword hit + if(eu != null) { + eu.setAbsorbDamageWithPower(!eu.isAbsorbDamageWithPower()); + eu.writeToItem(sword); + + if(eu.energy > Config.darkSteelSwordPowerUsePerHit) { + extractEnergy(player.getCurrentEquippedItem(), Config.darkSteelSwordPowerUsePerHit, false); + if(entity instanceof EntityEnderman) { + entity.getEntityData().setBoolean("hitByDarkSteelSword", true); + } } + } + } return true; } @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - return energyCont.receiveEnergy(container, maxReceive, simulate); + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); } @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - return energyCont.extractEnergy(container, maxExtract, simulate); + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); } @Override public int getEnergyStored(ItemStack container) { - return energyCont.getEnergyStored(container); + return EnergyUpgrade.getEnergyStored(container); } @Override public int getMaxEnergyStored(ItemStack container) { - return energyCont.getMaxEnergyStored(container); + return EnergyUpgrade.getMaxEnergyStored(container); } @Override @@ -220,20 +228,29 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + AnvilRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); } @Override public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(ItemUtil.getDurabilityString(itemstack)); - list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); + if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + list.add(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BLUE + Lang.localize("item.darkSteel_sword.tooltip.line3")); + } + AnvilRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); } @Override public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(Lang.localize("item.darkSteel.tooltip.line1")); - list.add(Lang.localize("item.darkSteel_sword.tooltip.line1")); - list.add(Lang.localize("item.darkSteel_sword.tooltip.line2")); - list.add(EnumChatFormatting.BLUE + Lang.localize("item.darkSteel_sword.tooltip.line3")); + list.add(ItemUtil.getDurabilityString(itemstack)); + + if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + EnergyUpgrade.addVibrantTooltip(list, itemstack); + list.add(EnumChatFormatting.ITALIC + Lang.localize("item.darkSteel_sword.tooltip.line1")); + list.add(EnumChatFormatting.ITALIC + Lang.localize("item.darkSteel_sword.tooltip.line2")); + list.add(EnumChatFormatting.ITALIC + Lang.localize("item.darkSteel_sword.tooltip.line3")); + } + EnergyUpgrade.addNextUpgradeTooltip(itemstack, entityplayer, list, flag); + AnvilRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } public ItemStack createItemStack() {