From 77207ceab193448f16f96b7f4be63a98ddc929fa Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 18 Jun 2014 21:18:45 +0200 Subject: [PATCH] A few GUI fixes --- src/main/java/mekanism/client/gui/GuiPRC.java | 20 +++++++++--------- .../mekanism/client/gui/GuiPortableTank.java | 9 ++++---- .../mekanism/gui/{GuiPRC.png => GuiBlank.png} | Bin 3 files changed, 14 insertions(+), 15 deletions(-) rename src/main/resources/assets/mekanism/gui/{GuiPRC.png => GuiBlank.png} (100%) diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index ef9832ac5..5823ea322 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -29,7 +29,7 @@ public class GuiPRC extends GuiMekanism super(tentity, new ContainerPRC(inventory, tentity)); tileEntity = tentity; - guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"))); + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @Override @@ -37,26 +37,26 @@ public class GuiPRC extends GuiMekanism { return tileEntity.inputFluidTank; } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 5, 10)); + }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 5, 10)); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @Override public GasTank getTank() { return tileEntity.inputGasTank; } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 28, 10)); + }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 28, 10)); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @Override public GasTank getTank() { return tileEntity.outputGasTank; } - }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 140, 40)); - guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 164, 15)); + }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 140, 40)); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 164, 15)); - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 53, 34)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 140, 18).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 115, 34)); + guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 53, 34)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 140, 18).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 115, 34)); guiElements.add(new GuiProgress(new IProgressInfoHandler() { @@ -65,7 +65,7 @@ public class GuiPRC extends GuiMekanism { return tileEntity.getScaledProgress(); } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 75, 37)); + }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 75, 37)); } @Override @@ -83,7 +83,7 @@ public class GuiPRC extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiPortableTank.java index 3bc12108c..50f83e127 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTank.java @@ -24,7 +24,6 @@ public class GuiPortableTank extends GuiMekanism { super(new ContainerPortableTank(inventory, tentity)); tileEntity = tentity; - guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPortableTank.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @Override @@ -32,9 +31,9 @@ public class GuiPortableTank extends GuiMekanism { return tileEntity.fluidTank; } - }, GuiFluidGauge.Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPortableTank.png"), 55, 18)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPortableTank.png"), 16, 34).with(SlotOverlay.INPUT)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPortableTank.png"), 142, 34).with(SlotOverlay.OUTPUT)); + }, GuiFluidGauge.Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 55, 18)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 145, 19).with(SlotOverlay.INPUT)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 145, 50).with(SlotOverlay.OUTPUT)); } @Override @@ -49,7 +48,7 @@ public class GuiPortableTank extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPortableTank.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/src/main/resources/assets/mekanism/gui/GuiPRC.png b/src/main/resources/assets/mekanism/gui/GuiBlank.png similarity index 100% rename from src/main/resources/assets/mekanism/gui/GuiPRC.png rename to src/main/resources/assets/mekanism/gui/GuiBlank.png