Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-23 13:50:43 +00:00
commit 0f40514cc7
57 files changed
+2145 -294

No files matched your search

@@ -8,6 +8,7 @@ import mekanism.api.Coord4D;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
import mekanism.common.multiblock.IMultiblock;
import mekanism.common.multiblock.IStructuralMultiblock;
import mekanism.common.multiblock.MultiblockCache;
import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.multiblock.SynchronizedData;
@@ -133,6 +134,7 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
}
}
@Override
public void update()
{
if(!worldObj.isRemote && (structure == null || !getSynchronizedData().didTick))
@@ -273,6 +275,12 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
}
}
@Override
public boolean onActivate(EntityPlayer player)
{
return false;
}
@Override
@SideOnly(Side.CLIENT)
public AxisAlignedBB getRenderBoundingBox()