From 5e1d82e0e959699ca0ba778b43dfc6d47e315878 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Thu, 15 Jan 2015 23:16:09 +0100 Subject: [PATCH] show upgrade information in Stirling generator GUI when the upgrade slot is empty --- resources/assets/enderio/lang/en_US.lang | 2 ++ .../stirling/GuiStirlingGenerator.java | 35 +++++++++++++++++++ .../stirling/TileEntityStirlingGenerator.java | 12 +++++-- .../machine/gui/AbstractMachineContainer.java | 11 ++++-- 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index d00a39eb..a7cb9b2d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -775,6 +775,8 @@ enderio.combustionGenerator.output=Generating: //Stirling Gen enderio.stirlingGenerator.output=Generating: enderio.stirlingGenerator.burnRate=Burn Rate: +enderio.stirlingGenerator.upgradeslot=Upgrade slot +enderio.stirlingGenerator.upgrades={0} gives {2}{1,number,#.#}x{3} efficency //Travel Blocks enderio.gui.travelAccessable.privateBlock1=Only diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index 71b3954b..7882fb70 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -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 playerSlotLocations = new HashMap(); + 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; }