Completed merge

This commit is contained in:
aidancbrady 2016-02-28 12:32:36 -05:00
parent 3d43a96f91
commit 2451ac4819
2 changed files with 13 additions and 2 deletions

View file

@ -27,7 +27,18 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer
public void renderAModelAt(TileEntityBoilerCasing tileEntity, double x, double y, double z, float partialTick)
{
if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null)
{
if(tileEntity.structure.waterStored != null && tileEntity.structure.waterStored.amount != 0)
{
}
if(tileEntity.structure.steamStored != null && tileEntity.structure.steamStored.amount != 0)
{
}
}
}
public static void resetDisplayInts()

View file

@ -73,7 +73,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol<SynchronizedMatrixData>
}
@Override
public boolean isInteriorValid(SynchronizedMatrixData structure)
protected boolean canForm(SynchronizedMatrixData structure)
{
for(Coord4D coord : innerNodes)
{