diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java index f68af857b..cf003072b 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java @@ -24,12 +24,13 @@ import resonant.lib.network.Synced; import resonant.lib.network.Synced.SyncedInput; import resonant.lib.network.Synced.SyncedOutput; import resonantinduction.mechanical.energy.grid.MechanicalNode; +import resonantinduction.mechanical.energy.grid.TileMechanical; import universalelectricity.api.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; /** Reduced version of the main turbine class */ -public class TileTurbine extends TileBase implements IMultiBlockStructure, INodeProvider, IPacketReceiverWithID +public class TileTurbine extends TileMechanical implements IMultiBlockStructure, INodeProvider, IPacketReceiverWithID { /** Tier of the tile */ public int tier = 0; @@ -43,10 +44,10 @@ public class TileTurbine extends TileBase implements IMultiBlockStructure nodeType, ForgeDirection from) - { - if (nodeType.isAssignableFrom(mechanicalNode.getClass())) - return ((TileTurbine) getMultiBlock().get()).mechanicalNode; - return null; - } - - @Override - public void invalidate() - { - mechanicalNode.deconstruct(); - super.invalidate(); - } - - @Override - public boolean onReceivePacket(int id, ByteArrayDataInput data, EntityPlayer player, Object... extra) - { - if (world().isRemote) - { - if (id == 0) - { - try - { - readFromNBT(PacketHandler.readNBTTagCompound(data)); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - else if (id == 1) - { - this.mechanicalNode.angularVelocity = data.readDouble(); - } - } - return false; - } - }