From a15d964a8ac69ca2fdd27ccd641a55a8afc7447f Mon Sep 17 00:00:00 2001 From: "spookydonut (Ash Wiren)" Date: Tue, 4 Feb 2014 17:07:37 +0800 Subject: [PATCH] Added UI elements for #962, making electrolytic separators dump excess gas --- .../client/gui/GuiElectrolyticSeparator.java | 6 ++++++ .../mekanism/gui/GuiElectrolyticSeparator.png | Bin 4259 -> 4776 bytes 2 files changed, 6 insertions(+) mode change 100644 => 100755 common/mekanism/client/gui/GuiElectrolyticSeparator.java diff --git a/common/mekanism/client/gui/GuiElectrolyticSeparator.java b/common/mekanism/client/gui/GuiElectrolyticSeparator.java old mode 100644 new mode 100755 index 9741171ea..521410bd0 --- a/common/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/common/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -86,6 +86,9 @@ public class GuiElectrolyticSeparator extends GuiMekanism name = tileEntity.dumpRight ? "Dumping..." : tileEntity.rightTank.getGas() == null ? MekanismUtils.localize("gui.none") : tileEntity.rightTank.getGas().getGas().getLocalizedName(); fontRenderer.drawString(name, 156-fontRenderer.getStringWidth(name), 73, 0x404040); + + name = tileEntity.dumpExcess ? "Dumping Excess" : "Stop when full"; + fontRenderer.drawString(name, 97, 6, 0x404040); if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11 && yAxis <= 69) { @@ -123,6 +126,9 @@ public class GuiElectrolyticSeparator extends GuiMekanism int rightDisplay = tileEntity.dumpRight ? 60 : 52; drawTexturedModalRect(guiWidth + 160, guiHeight + 73, 176, rightDisplay, 8, 8); + + int dumpDisplay = tileEntity.dumpExcess ? 60 : 52; + drawTexturedModalRect(guiWidth + 84, guiHeight + 6, 176, dumpDisplay, 8, 8); int displayInt; diff --git a/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png b/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png index 13b91156daab4314c34b24e3940a8c2be0c4218d..9c6e486c58e19d0a5cf0a8e908b1468d0765de83 100644 GIT binary patch literal 4776 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 F`7fxH%Z&g4 literal 4259 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