tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed Electric Pump text overlap, fixed OreDict filter not reading from nbt/packet properly

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-22 00:40:05 -05:00
parent f8f1467304
commit dd96064a3f
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/client/gui/GuiElectricPump.java
View file

@ -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);
}

7
src/main/java/mekanism/common/content/miner/MOreDictFilter.java
View file

@ -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);
}