Merge pull request #1686 from MatthiasMann/master

show upgrade information in Stirling generator GUI when the upgrade slot is empty
This commit is contained in:
tterrag1098 committed 2015-01-18 16:31:27 -05:00
commit e70875c0ef
4 files changed
+56 -4

No files matched your search

@@ -1,9 +1,13 @@
package crazypants.enderio.machine.generator.stirling;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Rectangle;
import java.text.MessageFormat;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.opengl.GL11;
@@ -11,6 +15,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.enderio.power.Capacitors;
import crazypants.gui.GuiToolTip;
import crazypants.render.ColorUtil;
import crazypants.render.RenderUtil;
import crazypants.util.Lang;
@@ -20,6 +26,35 @@ public class GuiStirlingGenerator extends GuiPoweredMachineBase<TileEntityStirli
public GuiStirlingGenerator(InventoryPlayer par1InventoryPlayer, TileEntityStirlingGenerator te) {
super(te, new StirlingGeneratorContainer(par1InventoryPlayer, te));
final StirlingGeneratorContainer c = (StirlingGeneratorContainer)inventorySlots;
Rectangle r = new Rectangle(c.getUpgradeOffset(), new Dimension(16, 16));
MessageFormat fmt = new MessageFormat(Lang.localize("stirlingGenerator.upgrades"));
ttMan.addToolTip(new GuiToolTip(r,
Lang.localize("stirlingGenerator.upgradeslot"),
formatUpgrade(fmt, Capacitors.ACTIVATED_CAPACITOR),
formatUpgrade(fmt, Capacitors.ENDER_CAPACITOR)) {
@Override
public boolean shouldDraw() {
return !c.getUpgradeSlot().getHasStack() && super.shouldDraw();
}
});
}
private static float getFactor(Capacitors upgrade) {
return TileEntityStirlingGenerator.getEnergyMultiplier(upgrade) /
TileEntityStirlingGenerator.getBurnTimeMultiplier(upgrade);
}
private static String formatUpgrade(MessageFormat fmt, Capacitors upgrade) {
float efficiency = getFactor(upgrade) / getFactor(Capacitors.BASIC_CAPACITOR);
Object[] args = new Object[] {
Lang.localize(upgrade.unlocalisedName.concat(".name"), false),
efficiency,
EnumChatFormatting.WHITE,
EnumChatFormatting.GRAY
};
return fmt.format(args, new StringBuffer(), null).toString();
}
@Override
@@ -173,7 +173,7 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
return doPush(dir, te, 0, 0);
}
private float getEnergyMultiplier() {
public static float getEnergyMultiplier(Capacitors capacitorType) {
if(capacitorType == Capacitors.ACTIVATED_CAPACITOR) {
return 2;
} else if(capacitorType == Capacitors.ENDER_CAPACITOR) {
@@ -182,7 +182,11 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
return 1;
}
public float getBurnTimeMultiplier() {
private float getEnergyMultiplier() {
return getEnergyMultiplier(capacitorType);
}
public static float getBurnTimeMultiplier(Capacitors capacitorType) {
if(capacitorType == Capacitors.ACTIVATED_CAPACITOR) {
return 1.5f;
} else if(capacitorType == Capacitors.ENDER_CAPACITOR) {
@@ -191,6 +195,10 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
return 2;
}
public float getBurnTimeMultiplier() {
return getBurnTimeMultiplier(capacitorType);
}
//private PowerDistributor powerDis;
private boolean transmitEnergy() {
if(powerDis == null) {
@@ -21,13 +21,15 @@ public abstract class AbstractMachineContainer extends Container {
protected Map<Slot, Point> playerSlotLocations = new HashMap<Slot, Point>();
protected Slot upgradeSlot;
public AbstractMachineContainer(InventoryPlayer playerInv, AbstractMachineEntity te) {
this.tileEntity = te;
addMachineSlots(playerInv);
if(te.getSlotDefinition().getNumUpgradeSlots() == 1) {
addSlotToContainer(new Slot(te, te.getSlotDefinition().getMinUpgradeSlot(), getUpgradeOffset().x, getUpgradeOffset().y) {
upgradeSlot = new Slot(te, te.getSlotDefinition().getMinUpgradeSlot(), getUpgradeOffset().x, getUpgradeOffset().y) {
@Override
public int getSlotStackLimit() {
@@ -38,7 +40,8 @@ public abstract class AbstractMachineContainer extends Container {
public boolean isItemValid(ItemStack itemStack) {
return tileEntity.isItemValidForSlot(tileEntity.getSlotDefinition().getMinUpgradeSlot(), itemStack);
}
});
};
addSlotToContainer(upgradeSlot);
}
int x = getPlayerInventoryOffset().x;
@@ -77,6 +80,10 @@ public abstract class AbstractMachineContainer extends Container {
return new Point(12,60);
}
public Slot getUpgradeSlot() {
return upgradeSlot;
}
public AbstractMachineEntity getTileEntity() {
return tileEntity;
}