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

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan Brady 2014-02-10 21:12:31 -05:00
commit 0904b4d7f6
4 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/mekanism/client/gui/GuiElectrolyticSeparator.java
View file

@ -86,9 +86,6 @@ 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)
{
@ -121,16 +118,11 @@ public class GuiElectrolyticSeparator extends GuiMekanism
int guiHeight = (height - ySize) / 2;
drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
int leftDisplay = tileEntity.dumpLeft ? 60 : 52;
drawTexturedModalRect(guiWidth + 8, guiHeight + 73, 176, leftDisplay, 8, 8);
int displayInt = tileEntity.dumpLeft ? 60 : 52;
drawTexturedModalRect(guiWidth + 8, guiHeight + 73, 176, displayInt, 8, 8);
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;
displayInt = tileEntity.dumpRight ? 60 : 52;
drawTexturedModalRect(guiWidth + 160, guiHeight + 73, 176, displayInt, 8, 8);
if(tileEntity.fluidTank.getFluid() != null)
{

2
common/mekanism/common/multipart/PartPressurizedTube.java
View file

@ -48,7 +48,7 @@ public class PartPressurizedTube extends PartTransmitter<GasNetwork>
cacheGas = null;
}
if(getTransmitterNetwork(false) != null)
if(getTransmitterNetwork(false) != null && getTransmitterNetwork(false).getSize() > 0)
{
int last = lastWrite != null ? lastWrite.amount : 0;

8
common/mekanism/common/tile/TileEntityElectrolyticSeparator.java
View file

@ -139,9 +139,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
if(tileEntity instanceof IGasHandler)
{
if(((IGasHandler)tileEntity).canReceiveGas(ForgeDirection.getOrientation(facing).getOpposite(), leftTank.getGas().getGas()))
if(((IGasHandler)tileEntity).canReceiveGas(MekanismUtils.getLeft(facing).getOpposite(), leftTank.getGas().getGas()))
{
leftTank.draw(((IGasHandler)tileEntity).receiveGas(ForgeDirection.getOrientation(facing).getOpposite(), toSend), true);
leftTank.draw(((IGasHandler)tileEntity).receiveGas(MekanismUtils.getLeft(facing).getOpposite(), toSend), true);
}
}
}
@ -166,9 +166,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
if(tileEntity instanceof IGasHandler)
{
if(((IGasHandler)tileEntity).canReceiveGas(ForgeDirection.getOrientation(facing).getOpposite(), rightTank.getGas().getGas()))
if(((IGasHandler)tileEntity).canReceiveGas(MekanismUtils.getRight(facing).getOpposite(), rightTank.getGas().getGas()))
{
rightTank.draw(((IGasHandler)tileEntity).receiveGas(ForgeDirection.getOrientation(facing).getOpposite(), toSend), true);
rightTank.draw(((IGasHandler)tileEntity).receiveGas(MekanismUtils.getRight(facing).getOpposite(), toSend), true);
}
}
}

BIN
resources/assets/mekanism/gui/GuiElectrolyticSeparator.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB