diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index dc03842f..866bc2e7 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -234,12 +234,9 @@ item.darkSteel_boots.name=Dark Boots item.darkSteel_sword.name=The Ender item.darkSteel_pickaxe.name=Dark Pick -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 -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 @@ -248,10 +245,25 @@ enderio.item.darkSteel_sword.tooltip.line1=Increased skull and ender pearl drops enderio.item.darkSteel_sword.tooltip.line2=Enderman can't teleport once hit. enderio.item.darkSteel_sword.tooltip.line3=+1 Damage when Powered -enderio.darksteel.upgrade.vibrant=Vibrant -enderio.darksteel.upgrade.energy_one=Energy 1 -enderio.darksteel.upgrade.energy_two=Energy 2 -enderio.darksteel.upgrade.energy_three=Energy 3 +enderio.darksteel.upgrade.vibrant.name=Empowered +enderio.darksteel.upgrade.vibrant.tooltip.detailed.line1=Power: $P +enderio.darksteel.upgrade.vibrant.tooltip.detailed.line2=Half durability damage absorbed +enderio.darksteel.upgrade.vibrant.tooltip.detailed.line3=by power. + +enderio.darksteel.upgrade.energy_one.name=Empowered 2 +enderio.darksteel.upgrade.energy_one.tooltip.detailed.line1=Power: $P +enderio.darksteel.upgrade.energy_one.tooltip.detailed.line2=Half durability damage absorbed +enderio.darksteel.upgrade.energy_one.tooltip.detailed.line3=by power. + +enderio.darksteel.upgrade.energy_two.name=Empowered 3 +enderio.darksteel.upgrade.energy_two.tooltip.detailed.line1=Power: $P +enderio.darksteel.upgrade.energy_two.tooltip.detailed.line2=Half durability damage absorbed +enderio.darksteel.upgrade.energy_two.tooltip.detailed.line3=by power. + +enderio.darksteel.upgrade.energy_three.name=Empowered 4 +enderio.darksteel.upgrade.energy_three.tooltip.detailed.line1=Power: $P +enderio.darksteel.upgrade.energy_three.tooltip.detailed.line2=Half durability damage absorbed +enderio.darksteel.upgrade.energy_three.tooltip.detailed.line3=by power. //------GUI diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index a0a79422..cd5b6d74 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -132,8 +132,8 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider @Override @SideOnly(Side.CLIENT) - public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - TooltipAddera.addDescriptionFromResources(list, itemstack); + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDetailedTooltipFromResources(list, itemstack); } public static final class FacadePainterRecipe extends BasicPainterTemplate { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index 0ce5b2f7..8ee9bd9a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -59,7 +59,7 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT @Override @SideOnly(Side.CLIENT) - public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { int extractRate; int maxIo; @@ -75,7 +75,7 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT list.add(Lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt); if(itemstack.getItemDamage() == 0) { - TooltipAddera.addDescriptionFromResources(list, itemstack); + TooltipAddera.addDetailedTooltipFromResources(list, itemstack); } } diff --git a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java index e95e9135..4cb286c2 100644 --- a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java +++ b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java @@ -59,7 +59,7 @@ public class ItemBucketEio extends ItemBucket implements IAdvancedTooltipProvide @Override @SideOnly(Side.CLIENT) - public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { TooltipAddera.instance.addTooltipForFluid(list, itemstack); } diff --git a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java index c7ed3f90..fb1d63cf 100644 --- a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java +++ b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java @@ -16,7 +16,7 @@ public interface IAdvancedTooltipProvider { public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); @SideOnly(Side.CLIENT) - public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); } diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index fc60287d..8d1918d9 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -92,7 +92,7 @@ public class TooltipAddera { public static void addInformation(IResourceTooltipProvider item, ItemTooltipEvent evt) { if(showAdvancedTooltips()) { - addDescriptionFromResources(evt.toolTip, item.getUnlocalizedName()); + addDetailedTooltipFromResources(evt.toolTip, item.getUnlocalizedName()); } else { addShowDetailsTooltip(evt.toolTip); } @@ -102,7 +102,7 @@ public class TooltipAddera { public static void addInformation(IAdvancedTooltipProvider tt, ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { tt.addCommonEntries(itemstack, entityplayer, list, flag); if(showAdvancedTooltips()) { - tt.addAdvancedEntries(itemstack, entityplayer, list, flag); + tt.addDetailedEntries(itemstack, entityplayer, list, flag); } else { tt.addBasicEntries(itemstack, entityplayer, list, flag); addShowDetailsTooltip(list); @@ -117,8 +117,20 @@ public class TooltipAddera { return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); } - public static void addDescriptionFromResources(List list, String unlocalizedName) { - String keyBase = unlocalizedName + ".tooltip.detailed.line"; + public static void addDetailedTooltipFromResources(List list, String unlocalizedName) { + addTooltipFromResources(list, unlocalizedName, ".tooltip.detailed.line"); + } + + public static void addBasicTooltipFromResources(List list, String unlocalizedName) { + addTooltipFromResources(list, unlocalizedName, ".tooltip.basic.line"); + } + + public static void addCommonTooltipFromResources(List list, String unlocalizedName) { + addTooltipFromResources(list, unlocalizedName, ".tooltip.common.line"); + } + + public static void addTooltipFromResources(List list, String unlocalizedName, String tooltipTag) { + String keyBase = unlocalizedName + tooltipTag; boolean done = false; int line = 1; while(!done) { @@ -133,7 +145,7 @@ public class TooltipAddera { } } - public static void addDescriptionFromResources(List list,ItemStack itemstack) { + public static void addDetailedTooltipFromResources(List list,ItemStack itemstack) { if(itemstack.getItem() == null) { return; } @@ -145,7 +157,7 @@ public class TooltipAddera { if(unlock == null) { unlock = itemstack.getItem().getUnlocalizedName(); } - addDescriptionFromResources(list, unlock); + addDetailedTooltipFromResources(list, unlock); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java index 81703a8e..4beabc08 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java @@ -8,6 +8,7 @@ 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.gui.TooltipAddera; import crazypants.util.ItemUtil; import crazypants.util.Lang; @@ -17,13 +18,7 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade { private static final String KEY_UNLOC_NAME = "unlocalized_name"; - 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()) + ":"); - } + public static final String KEY_UPGRADE_PREFIX = "enderio.darksteel.upgrade."; protected final int levelCost; protected final String id; @@ -44,17 +39,20 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade { @Override @SideOnly(Side.CLIENT) public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.instance.addCommonTooltipFromResources(list, unlocName); } @Override @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(unlocName)); + list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(unlocName + ".name", false)); } @Override @SideOnly(Side.CLIENT) - public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(unlocName + ".name", false)); + TooltipAddera.instance.addDetailedTooltipFromResources(list, unlocName); } @Override diff --git a/src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java index 7085c9af..158ce4b5 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java @@ -5,47 +5,48 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.AnvilUpdateEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.util.Lang; public class AnvilRecipeManager { - public static AnvilRecipeManager instance= new AnvilRecipeManager(); + public static AnvilRecipeManager instance = new AnvilRecipeManager(); + private List upgrades = new ArrayList(); - private List upgrades = new ArrayList(); + public AnvilRecipeManager() { + upgrades.add(EnergyUpgrade.VIBRANT); + upgrades.add(EnergyUpgrade.ENERGY_ONE); + upgrades.add(EnergyUpgrade.ENERGY_TWO); + upgrades.add(EnergyUpgrade.ENERGY_THREE); + } - public AnvilRecipeManager( ) { - upgrades.add(EnergyUpgrade.VIBRANT); - upgrades.add(EnergyUpgrade.ENERGY_ONE); - upgrades.add(EnergyUpgrade.ENERGY_TWO); - upgrades.add(EnergyUpgrade.ENERGY_THREE); - } + @SubscribeEvent + public void handleAnvilEvent(AnvilUpdateEvent evt) { + if(evt.left == null || evt.right == null) { + return; + } - @SubscribeEvent - public void handleAnvilEvent(AnvilUpdateEvent evt) { - if(evt.left == null || evt.right == null) { - return; - } + for (IDarkSteelUpgrade upgrade : upgrades) { + if(upgrade.isUpgradeItem(evt.right) && upgrade.canAddToItem(evt.left)) { + ItemStack res = new ItemStack(evt.left.getItem(), 1, evt.left.getItemDamage()); + upgrade.writeToItem(res); + evt.output = res; + evt.cost = upgrade.getLevelCost(); + return; + } + } - for(IDarkSteelUpgrade upgrade : upgrades) { - if(upgrade.isUpgradeItem(evt.right) && upgrade.canAddToItem(evt.left)) { - ItemStack res = new ItemStack(evt.left.getItem(), 1, evt.left.getItemDamage()); - upgrade.writeToItem(res); - evt.output = res; - evt.cost = upgrade.getLevelCost(); - return; - } - } - - } + } public List getUpgrades() { return upgrades; } public void addCommonTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - for(IDarkSteelUpgrade upgrade : upgrades) { + for (IDarkSteelUpgrade upgrade : upgrades) { if(upgrade.hasUpgrade(itemstack)) { upgrade.addCommonEntries(itemstack, entityplayer, list, flag); } @@ -53,7 +54,7 @@ public class AnvilRecipeManager { } public void addBasicTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - for(IDarkSteelUpgrade upgrade : upgrades) { + for (IDarkSteelUpgrade upgrade : upgrades) { if(upgrade.hasUpgrade(itemstack)) { upgrade.addBasicEntries(itemstack, entityplayer, list, flag); } @@ -61,9 +62,20 @@ public class AnvilRecipeManager { } public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - for(IDarkSteelUpgrade upgrade : upgrades) { + + List applyableUpgrades = new ArrayList(); + for (IDarkSteelUpgrade upgrade : upgrades) { if(upgrade.hasUpgrade(itemstack)) { - upgrade.addAdvancedEntries(itemstack, entityplayer, list, flag); + upgrade.addDetailedEntries(itemstack, entityplayer, list, flag); + } else if(upgrade.canAddToItem(itemstack)) { + applyableUpgrades.add(upgrade); + } + } + if(!applyableUpgrades.isEmpty()) { + list.add(EnumChatFormatting.YELLOW + "Anvil Upgrades: "); + for (IDarkSteelUpgrade up : applyableUpgrades) { + list.add(EnumChatFormatting.DARK_AQUA + "" + "" + Lang.localize(up.getUnlocalizedName() + ".name", false) + ": "); + list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItem().getDisplayName() + " + " + up.getLevelCost() + " lvs"); } } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index 2a75cb85..1c0ac718 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -5,43 +5,35 @@ 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, + "enderio.darksteel.upgrade.vibrant", Config.darkSteelUpgradeVibrantCost, new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()), Config.darkSteelPowerStorageBase, - Config.darkSteelPowerStorageBase / 100) { - - @Override - public boolean canAddToItem(ItemStack stack) { - return !hasUpgrade(stack); - } - }; + Config.darkSteelPowerStorageBase / 100); public static final EnergyUpgrade ENERGY_ONE = new EnergyUpgrade( - "darksteel.upgrade.energy_one", Config.darkSteelUpgradePowerOneCost, + "enderio.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, + "enderio.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, + "enderio.darksteel.upgrade.energy_three", Config.darkSteelUpgradePowerThreeCost, new ItemStack(EnderIO.itemBasicCapacitor, 1, 2), Config.darkSteelPowerStorageLevelThree, Config.darkSteelPowerStorageLevelThree / 100); @@ -71,16 +63,6 @@ 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; @@ -118,6 +100,14 @@ public class EnergyUpgrade extends AbstractUpgrade { return res; } + public static String getStoredEnergyString(ItemStack itemstack) { + EnergyUpgrade up = loadFromItem(itemstack); + if(up == null) { + return null; + } + return PowerDisplayUtil.formatStoredPower(up.energy / 10, up.capacity/10); + } + public static int getEnergyStored(ItemStack container) { EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); if(eu == null) { @@ -134,13 +124,6 @@ public class EnergyUpgrade extends AbstractUpgrade { 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; @@ -178,41 +161,52 @@ public class EnergyUpgrade extends AbstractUpgrade { return stack.isItemEqual(upgradeItem) && stack.stackSize == upgradeItem.stackSize; } + @Override + public ItemStack getUpgradeItem() { + return upgradeItem; + } + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() == null) { + if(stack == null || stack.getItem() == null || !(stack.getItem() instanceof IDarkSteelItem)) { return false; } - if(stack.getItem() instanceof IDarkSteelItem) { - if(!itemHasAnyPowerUpgrade(stack)) { - return false; - } - EnergyUpgrade curUp = loadFromItem(stack); - if(curUp == null) { - return true; - } - return curUp.capacity < capacity; + EnergyUpgrade up = next(loadFromItem(stack)); + if(up == null) { + return false; } - return false; + return up.unlocName.equals(unlocName); } @Override @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - super.addCommonEntries(itemstack, entityplayer, list, flag); - } + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + int startIndex = list.size(); + super.addDetailedEntries(itemstack, entityplayer, list, flag); + int endIndex = list.size(); + int cap = capacity; +// if(!unlocName.equals(VIBRANT.unlocName)) { +// cap = cap - VIBRANT.capacity; +// } +// cap /= 10; - - - @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); + String capString = PowerDisplayUtil.formatPower(cap) + " " + PowerDisplayUtil.abrevation(); + for(int i=startIndex;i