From dd96064a3f0ae4dc0b0959078e5c025e980356cf Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sun, 22 Mar 2015 00:40:05 -0500 Subject: [PATCH] Fixed Electric Pump text overlap, fixed OreDict filter not reading from nbt/packet properly --- src/main/java/mekanism/client/gui/GuiElectricPump.java | 4 +++- .../java/mekanism/common/content/miner/MOreDictFilter.java | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index be01fe1fe..97c1d8c0f 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -54,7 +54,9 @@ public class GuiElectricPump extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 35, 0x00CD00); + + String text = tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"); + renderScaledText(text, 51, 35, 0x00CD00, 74); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java index d40cf00a6..9e83387a9 100644 --- a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java @@ -38,6 +38,8 @@ public class MOreDictFilter extends MinerFilter @Override protected void read(NBTTagCompound nbtTags) { + super.read(nbtTags); + oreDictName = nbtTags.getString("oreDictName"); } @@ -45,12 +47,17 @@ public class MOreDictFilter extends MinerFilter public void write(ArrayList data) { data.add(1); + + super.write(data); + data.add(oreDictName); } @Override protected void read(ByteBuf dataStream) { + super.read(dataStream); + oreDictName = PacketHandler.readString(dataStream); }