mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 19:49:54 +00:00
Strict and consistent typing for GUI's Container and Inventory
This commit is contained in:
1 parent
7362286ead
commit
f4e9c61e3a
42 files changed
+131
-218
No files matched your search
@@ -13,22 +13,20 @@
|
||||
*/
|
||||
package forestry.energy.gui;
|
||||
|
||||
import net.minecraft.inventory.Container;
|
||||
|
||||
import forestry.core.gadgets.Engine;
|
||||
import forestry.core.gui.ContainerForestry;
|
||||
import forestry.core.gui.GuiForestryTitled;
|
||||
import forestry.core.gui.Ledger;
|
||||
import forestry.core.render.TextureManager;
|
||||
import forestry.core.utils.StringUtil;
|
||||
|
||||
public abstract class GuiEngine extends GuiForestryTitled<Engine> {
|
||||
public abstract class GuiEngine<C extends Container, I extends Engine> extends GuiForestryTitled<C, I> {
|
||||
|
||||
protected class EngineLedger extends Ledger {
|
||||
|
||||
private final Engine engine;
|
||||
|
||||
public EngineLedger(Engine engine) {
|
||||
public EngineLedger() {
|
||||
super(ledgerManager);
|
||||
this.engine = engine;
|
||||
maxHeight = 94;
|
||||
overlayColor = fontColor.get("ledger.power.background");
|
||||
}
|
||||
@@ -48,27 +46,26 @@ public abstract class GuiEngine extends GuiForestryTitled<Engine> {
|
||||
|
||||
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.energy"), x + 22, y + 8, fontColor.get("ledger.power.header"));
|
||||
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.currentOutput") + ":", x + 22, y + 20, fontColor.get("ledger.power.subheader"));
|
||||
fontRendererObj.drawString(engine.getCurrentOutput() + " RF/t", x + 22, y + 32, fontColor.get("ledger.power.text"));
|
||||
fontRendererObj.drawString(inventory.getCurrentOutput() + " RF/t", x + 22, y + 32, fontColor.get("ledger.power.text"));
|
||||
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.stored") + ":", x + 22, y + 44, fontColor.get("ledger.power.subheader"));
|
||||
fontRendererObj.drawString(engine.getEnergyManager().getEnergyStored(engine.getOrientation()) + " RF", x + 22, y + 56, fontColor.get("ledger.power.text"));
|
||||
fontRendererObj.drawString(inventory.getEnergyManager().getEnergyStored(inventory.getOrientation()) + " RF", x + 22, y + 56, fontColor.get("ledger.power.text"));
|
||||
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.heat") + ":", x + 22, y + 68, fontColor.get("ledger.power.subheader"));
|
||||
fontRendererObj.drawString((((double) engine.getHeat() / (double) 10) + 20.0) + " C", x + 22, y + 80, fontColor.get("ledger.power.text"));
|
||||
|
||||
fontRendererObj.drawString((((double) inventory.getHeat() / (double) 10) + 20.0) + " C", x + 22, y + 80, fontColor.get("ledger.power.text"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTooltip() {
|
||||
return engine.getCurrentOutput() + " RF/t";
|
||||
return inventory.getCurrentOutput() + " RF/t";
|
||||
}
|
||||
}
|
||||
|
||||
public GuiEngine(String texture, ContainerForestry container, Engine tile) {
|
||||
public GuiEngine(String texture, C container, I tile) {
|
||||
super(texture, container, tile);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initLedgers(Object inventory) {
|
||||
super.initLedgers(inventory);
|
||||
ledgerManager.insert(new EngineLedger(tile));
|
||||
protected void initLedgers() {
|
||||
super.initLedgers();
|
||||
ledgerManager.insert(new EngineLedger());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user