show how much power is generated for a fuel item inside a Stirling generator

This commit is contained in:
Matthias Mann committed 2015-01-14 20:32:32 +01:00
1 parent a59f0e2487
commit 2358498dae
4 files changed
+48 -5

No files matched your search

@@ -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<String> toolTip, ItemStack itemStack) {
if(!itemStack.isItemStackDamageable()) {
return;
@@ -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]);
@@ -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