diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index ecfb8672f..deb89681b 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -24,6 +24,8 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorPort; +import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; +import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; @@ -54,6 +56,8 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityReactorPort.class, "ReactorPort"); GameRegistry.registerTileEntity(TileEntityReactorLogicAdapter.class, "ReactorLogicAdapter"); GameRegistry.registerTileEntity(TileEntityRotationalComplex.class, "RotationalComplex"); + GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); + GameRegistry.registerTileEntity(TileEntityElectromagneticCoil.class, "ElectromagneticCoil"); } /** diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 038b6f341..19bdf55fb 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -62,8 +62,10 @@ import cpw.mods.fml.relauncher.SideOnly; * 7: Turbine Rotor * 8: Rotational Complex * 9: Pressure Disperser - * 10: Turbine Casing - * 11: Turbine Valve + * 10: Electromagnetic Coil + * 11: Turbine Casing + * 12: Turbine Valve + * 13: Turbine Vent * @author AidanBrady * */ diff --git a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java index 79453ad70..b2d228906 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -4,7 +4,7 @@ import mekanism.common.multiblock.SynchronizedData; public class SynchronizedTurbineData extends SynchronizedData { - public int turbineBlades; + public int blades; public int vents; public int coils; diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index e806140f5..502bfd700 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -8,7 +8,9 @@ import mekanism.api.Coord4D; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; +import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.block.BlockGenerator.GeneratorType; import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; @@ -30,6 +32,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol turbines = new HashSet(); Set dispersers = new HashSet(); + Set coils = new HashSet(); //Scan for complex for(Coord4D coord : innerNodes) { - if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityRotationalComplex) + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityRotationalComplex) { if(complex != null) { @@ -89,7 +97,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol structure.minLocation.yCoord; y--) { @@ -145,6 +159,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol structure.coils) + { + return false; + } + for(Coord4D coord : structure.locations) { if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityTurbineVent) @@ -176,6 +204,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol