From b618127b96f5520554a7a808ae1eb229bc152f5e Mon Sep 17 00:00:00 2001 From: cp Date: Wed, 23 Apr 2014 12:10:36 +0800 Subject: [PATCH] More tooltip goodness. --- resources/assets/enderio/lang/en_US.lang | 5 +++ .../java/crazypants/enderio/ClientProxy.java | 4 ++ src/main/java/crazypants/enderio/Config.java | 8 ++-- .../enderio/fluid/BucketHandler.java | 38 ++++++++++++++++++ .../enderio/gui/IAdvancedTooltipProvider.java | 17 ++++++++ .../crazypants/enderio/gui/TooltipAddera.java | 32 +++++++++++++++ .../crazypants/enderio/gui/TooltipUtil.java | 25 ++++++++++++ .../enderio/item/ItemDarkSteelPickaxe.java | 39 +++++++++++-------- .../enderio/item/ItemDarkSteelSword.java | 36 ++++++++++------- .../machine/power/PowerDisplayUtil.java | 6 +++ .../enderio/material/ItemCapacitor.java | 15 +++++++ 11 files changed, 192 insertions(+), 33 deletions(-) create mode 100644 src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java create mode 100644 src/main/java/crazypants/enderio/gui/TooltipAddera.java create mode 100644 src/main/java/crazypants/enderio/gui/TooltipUtil.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 9a377c03..7df67978 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -52,6 +52,9 @@ item.bucketRocket_fuel.name=Rocket Fuel Bucket item.bucketFire_water.name=Fire Water Bucket enderio.fluid.millibucket.abr=MB +enderio.fuel.tooltip.heading=Fuel Details +enderio.fuel.tooltip.burnTime=burn time + //Materials enderio.itemMachinePart.name=Machine Parts @@ -94,6 +97,8 @@ enderio.basicCapacitor.name=Basic Capacitor enderio.activatedCapacitor.name=Double-Layer Capacitor enderio.enderCapacitor.name=Octadic Capacitor +enderio.machine.tooltip.upgrade=Machine Upgrade + //Machines tile.blockStirlingGenerator.name=Stirling Generator tile.blockReservoir.name=Reservoir diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 427441cb..88463ba6 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -38,6 +38,7 @@ import crazypants.enderio.enderface.EnderIoRenderer; import crazypants.enderio.enderface.TileEnderIO; import crazypants.enderio.farm.BlockFarmStation; import crazypants.enderio.farm.FarmingStationRenderer; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.item.PoweredItemRenderer; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; @@ -119,6 +120,9 @@ public class ClientProxy extends CommonProxy { public void load() { super.load(); + //make sure the tooltip stuff is registered + TooltipAddera tta = TooltipAddera.instance; + // Renderers AbstractMachineBlock.renderId = RenderingRegistry.getNextAvailableRenderId(); diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index 6ff60a40..c12caa67 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -114,6 +114,9 @@ public final class Config { public static int fireWaterPowerTotalBurnTime = (int)Math.round(hootchPowerTotalBurnTime * 1.5); public static float vatPowerUserPerTick = 2; + public static boolean addFuelTooltipsToAllFluidContainers = true; + public static boolean addFurnaceFuelTootip = true; + public static void load(FMLPreInitializationEvent event) { configDirectory = new File(event.getModConfigurationDirectory(), "enderio"); if(!configDirectory.exists()) { @@ -328,14 +331,13 @@ public final class Config { rocketFuelPowerTotalBurnTime = config.get("Settings", "rocketFuelPowerTotalBurnTime", rocketFuelPowerTotalBurnTime, "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(rocketFuelPowerTotalBurnTime); - - - fireWaterPowerPerCycle = config.get("Settings", "fireWaterPowerPerCycle", fireWaterPowerPerCycle, "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6").getInt(fireWaterPowerPerCycle); fireWaterPowerTotalBurnTime = config.get("Settings", "fireWaterPowerTotalBurnTime", fireWaterPowerTotalBurnTime, "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(fireWaterPowerTotalBurnTime); + addFuelTooltipsToAllFluidContainers = config.get("Settings", "addFuelTooltipsToAllFluidContainers", addFuelTooltipsToAllFluidContainers, + "If true, the MJ/t and burn time of the fuel will be displayed in all tooltips for fluid containers with fuel.").getBoolean(addFuelTooltipsToAllFluidContainers); //TODO: Debug renderCapBankGauge = config.get("Debug", "renderCapBankGauge", renderCapBankGauge, "If not true capacitor banks will not render the level gauge at all.") diff --git a/src/main/java/crazypants/enderio/fluid/BucketHandler.java b/src/main/java/crazypants/enderio/fluid/BucketHandler.java index 4cee520f..6256a14b 100644 --- a/src/main/java/crazypants/enderio/fluid/BucketHandler.java +++ b/src/main/java/crazypants/enderio/fluid/BucketHandler.java @@ -1,17 +1,28 @@ package crazypants.enderio.fluid; import java.util.HashMap; +import java.util.List; import java.util.Map; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import buildcraft.api.fuels.IronEngineFuel; +import buildcraft.api.fuels.IronEngineFuel.Fuel; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.Config; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.util.Lang; public class BucketHandler { @@ -51,4 +62,31 @@ public class BucketHandler { } } + @SubscribeEvent + public void addFuelTooltip(ItemTooltipEvent evt) { + ItemStack stack = evt.itemStack; + if(stack == null) { + return; + } + + if(Config.addFuelTooltipsToAllFluidContainers || stack.getItem() instanceof ItemBucketEio) { + FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); + if(fluidStack == null) { + return; + } + addTooltipForFluid(evt.toolTip, fluidStack.getFluid()); + } + } + + protected void addTooltipForFluid(List list, Fluid fluid) { + if(fluid != null) { + Fuel fuel = IronEngineFuel.getFuelForFluid(fluid); + if(fuel != null) { + list.add(Lang.localize("fuel.tooltip.heading")); + list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); + list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + Lang.localize("fuel.tooltip.burnTime")); + } + } + } + } diff --git a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java new file mode 100644 index 00000000..1569aaa3 --- /dev/null +++ b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java @@ -0,0 +1,17 @@ +package crazypants.enderio.gui; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public interface IAdvancedTooltipProvider { + + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + + public void addAdvancedEntries(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 new file mode 100644 index 00000000..4b1ae1bb --- /dev/null +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -0,0 +1,32 @@ +package crazypants.enderio.gui; + +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.Config; + +public class TooltipAddera { + + + public static TooltipAddera instance = new TooltipAddera(); + + static { + MinecraftForge.EVENT_BUS.register(instance); + } + + @SubscribeEvent + public void addTooltip(ItemTooltipEvent evt) { + if(evt.itemStack == null) { + return; + } + if(Config.addFurnaceFuelTootip) { + int time = TileEntityFurnace.getItemBurnTime(evt.itemStack); + if(time > 0) { + evt.toolTip.add("Burn time " + time); + } + } + } + + +} diff --git a/src/main/java/crazypants/enderio/gui/TooltipUtil.java b/src/main/java/crazypants/enderio/gui/TooltipUtil.java new file mode 100644 index 00000000..3cb8e713 --- /dev/null +++ b/src/main/java/crazypants/enderio/gui/TooltipUtil.java @@ -0,0 +1,25 @@ +package crazypants.enderio.gui; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import org.lwjgl.input.Keyboard; + +import crazypants.util.Lang; + +public class TooltipUtil { + + public static void addInformation(IAdvancedTooltipProvider tt, ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + tt.addCommonEntries(itemstack, entityplayer, list, flag); + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + tt.addAdvancedEntries(itemstack, entityplayer, list, flag); + } else { + tt.addBasicEntries(itemstack, entityplayer, list, flag); + list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); + } + } + +} diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java index 2ec79c26..3848093c 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java @@ -12,20 +12,19 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; - -import org.lwjgl.input.Keyboard; - import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipUtil; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; import crazypants.util.Lang; -public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem { +public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider { public static boolean isEquipped(EntityPlayer player) { if(player == null) { @@ -157,19 +156,27 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - 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() + ")"); + TooltipUtil.addInformation(this, itemstack, entityplayer, list, flag); + } - } else { - list.add(ItemUtil.getDurabilityString(itemstack)); - list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); - list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); - } + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(ItemUtil.getDurabilityString(itemstack)); + list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); + } + + @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() + ")"); } public ItemStack createItemStack() { diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java index de2e27cb..fad92480 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java @@ -17,22 +17,21 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; - -import org.lwjgl.input.Keyboard; - import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipUtil; 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 { +public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerItem, IAdvancedTooltipProvider { static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("darkSteel", 3, 1561, 7, 2, 25); @@ -222,16 +221,25 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - 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")); - } else { - list.add(ItemUtil.getDurabilityString(itemstack)); - list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); - list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); - } + TooltipUtil.addInformation(this, itemstack, entityplayer, list, flag); + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(ItemUtil.getDurabilityString(itemstack)); + list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); + } + + @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")); } public ItemStack createItemStack() { diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 484fd681..a7f2b440 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -68,6 +68,10 @@ public class PowerDisplayUtil { + PowerDisplayUtil.formatPower(ci.getMaxEnergyStored(item) / 10) + " " + PowerDisplayUtil.abrevation(); } + public static String formatPowerPerTick(float powerPerTick) { + return formatPower(powerPerTick) + " " + abrevation() + perTickStr(); + } + public static String formatStoredPower(double amount, double capacity) { return formatPower(amount) + "/" + formatPower(capacity) + " " + PowerDisplayUtil.abrevation(); } @@ -110,4 +114,6 @@ public class PowerDisplayUtil { return (int) currentPowerType.fromDisplayValue(input); } + + } diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index 5797b27b..2536ea5e 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -4,17 +4,21 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.ICapacitorItem; +import crazypants.util.Lang; public class ItemCapacitor extends Item implements ICapacitorItem { @@ -75,4 +79,15 @@ public class ItemCapacitor extends Item implements ICapacitorItem { return Capacitors.values()[damage].capacitor; } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + if(par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { + par3List.add(Lang.localize("machine.tooltip.upgrade")); + } + + } + + + }