More tooltip goodness.

This commit is contained in:
cp committed 2014-04-23 12:10:36 +08:00
1 parent b48cf4c2bb
commit b618127b96
11 files changed
+192 -33

No files matched your search

@@ -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();
+5 -3
View File
@@ -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.")
@@ -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"));
}
}
}
}
@@ -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);
}
@@ -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);
}
}
}
}
@@ -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"));
}
}
}
@@ -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() {
@@ -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() {
@@ -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);
}
}
@@ -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"));
}
}
}