From 2358498daee57fd28c6eb46f44b070320e669d42 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Wed, 14 Jan 2015 20:32:32 +0100 Subject: [PATCH] show how much power is generated for a fuel item inside a Stirling generator --- resources/assets/enderio/lang/en_US.lang | 2 + .../crazypants/enderio/gui/TooltipAddera.java | 39 +++++++++++++++++-- .../stirling/TileEntityStirlingGenerator.java | 6 ++- .../machine/gui/AbstractMachineContainer.java | 6 ++- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index c437ff1a..d00a39eb 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -4,6 +4,8 @@ enderio.power.rf=RF enderio.power.tick=/t enderio.power.maxOutput=Max Output +enderio.power.generates=Generates +enderio.power.generation_rate=at //Ender IO / Enderface tile.blockEnderIo.name=Ender IO diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 1cee032b..0de80de8 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -33,8 +33,11 @@ import crazypants.enderio.config.Config; import crazypants.enderio.fluid.FluidFuelRegister; import crazypants.enderio.fluid.IFluidCoolant; import crazypants.enderio.fluid.IFluidFuel; +import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.crusher.IGrindingMultiplier; +import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; +import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.util.ItemUtil; import crazypants.util.Lang; @@ -56,9 +59,11 @@ public class TooltipAddera { return; } if(Config.addFurnaceFuelTootip) { - int time = TileEntityFurnace.getItemBurnTime(evt.itemStack); - if(time > 0) { - evt.toolTip.add("Burn time " + time); + if(!addStirlinGeneratorTooltip(evt)) { + int time = TileEntityFurnace.getItemBurnTime(evt.itemStack); + if(time > 0) { + evt.toolTip.add("Burn time " + time); + } } } @@ -124,6 +129,34 @@ public class TooltipAddera { } } + private static boolean addStirlinGeneratorTooltip(ItemTooltipEvent evt) { + if(evt.entityPlayer.openContainer instanceof StirlingGeneratorContainer) { + AbstractMachineEntity te = ((StirlingGeneratorContainer)evt.entityPlayer.openContainer).getTileEntity(); + if(te instanceof TileEntityStirlingGenerator) { + TileEntityStirlingGenerator gen = (TileEntityStirlingGenerator) te; + int burnTime = gen.getBurnTime(evt.itemStack); + if(burnTime <= 0) { + return false; + } + + int rate = gen.getPowerUsePerTick(); + + String msg = String.format("%s %s %s %s %s %s%s", + Lang.localize("power.generates"), + PowerDisplayUtil.formatPower((long)burnTime * rate), + PowerDisplayUtil.abrevation(), + Lang.localize("power.generation_rate"), + PowerDisplayUtil.formatPower(rate), + PowerDisplayUtil.abrevation(), + PowerDisplayUtil.perTickStr()); + + evt.toolTip.add(msg); + return true; + } + } + return false; + } + public static void addDurabilityTooltip(List toolTip, ItemStack itemStack) { if(!itemStack.isItemStackDamageable()) { return; diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index 69827489..dcfe8513 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -109,6 +109,10 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme return Math.round(ENERGY_PER_TICK * getEnergyMultiplier()); } + public int getBurnTime(ItemStack item) { + return Math.round(TileEntityFurnace.getItemBurnTime(item) / getBurnTimeMultiplier()); + } + @Override protected boolean processTasks(boolean redstoneCheckPassed) { boolean needsUpdate = false; @@ -128,7 +132,7 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme if(burnTime <= 0 && getEnergyStored() < getMaxEnergyStored()) { if(inventory[0] != null && inventory[0].stackSize > 0) { - burnTime = Math.round(TileEntityFurnace.getItemBurnTime(inventory[0]) / getBurnTimeMultiplier()); + burnTime = getBurnTime(inventory[0]); if(burnTime > 0) { totalBurnTime = burnTime; ItemStack containedItem = inventory[0].getItem().getContainerItem(inventory[0]); diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 361b1d72..37a6abe2 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -76,7 +76,11 @@ public abstract class AbstractMachineContainer extends Container { public Point getUpgradeOffset() { return new Point(12,60); } - + + public AbstractMachineEntity getTileEntity() { + return tileEntity; + } + protected abstract void addMachineSlots(InventoryPlayer playerInv); @Override