diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 1afe0dbc2..7261371d0 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -29,13 +29,17 @@ import mekanism.generators.common.tile.TileEntityWindGenerator; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; +import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; +import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -53,6 +57,9 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy ClientRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine", new RenderWindTurbine()); ClientRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController", new RenderReactor()); ClientRegistry.registerTileEntity(TileEntityTurbineRotor.class, "TurbineRod", new RenderTurbineRotor()); + GameRegistry.registerTileEntity(TileEntityTurbineCasing.class, "TurbineCasing"); //TODO turbine render + GameRegistry.registerTileEntity(TileEntityTurbineValve.class, "TurbineValve"); + GameRegistry.registerTileEntity(TileEntityTurbineVent.class, "TurbineVent"); } @Override diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index deb89681b..977b4f358 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -27,7 +27,10 @@ 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.TileEntityTurbineCasing; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; +import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; @@ -73,6 +76,9 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine"); GameRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController"); GameRegistry.registerTileEntity(TileEntityTurbineRotor.class, "TurbineRod"); + GameRegistry.registerTileEntity(TileEntityTurbineCasing.class, "TurbineCasing"); + GameRegistry.registerTileEntity(TileEntityTurbineValve.class, "TurbineValve"); + GameRegistry.registerTileEntity(TileEntityTurbineVent.class, "TurbineVent"); } /** diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 53831ce96..7d2e3415e 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -33,7 +33,10 @@ import mekanism.generators.common.tile.TileEntityWindGenerator; 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.TileEntityTurbineCasing; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; +import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -99,12 +102,19 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB BASE_ICON = register.registerIcon("mekanism:SteelCasing"); ctms[10] = new CTMData("ctm/ElectromagneticCoil", this, Arrays.asList(10)).registerIcons(register); + ctms[11] = new CTMData("ctm/TurbineCasing", this, Arrays.asList(12, 13)).registerIcons(register); + ctms[12] = new CTMData("ctm/TurbineValve", this, Arrays.asList(11, 13)).registerIcons(register); + ctms[13] = new CTMData("ctm/TurbineVent", this, Arrays.asList(11, 12)).registerIcons(register); icons[7][0] = register.registerIcon("mekanism:TurbineRod"); icons[8][0] = register.registerIcon("mekanism:RotationalComplexSide"); icons[8][1] = register.registerIcon("mekanism:RotationalComplexTop"); icons[9][0] = register.registerIcon("mekanism:PressureDisperser"); + icons[10][0] = ctms[10].mainTextureData.icon; + icons[11][0] = ctms[10].mainTextureData.icon; + icons[12][0] = ctms[10].mainTextureData.icon; + icons[13][0] = ctms[10].mainTextureData.icon; } @Override @@ -123,11 +133,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(meta == GeneratorType.TURBINE_ROTOR.meta) - { - return icons[meta][0]; - } - else if(meta == GeneratorType.ROTATIONAL_COMPLEX.meta) + GeneratorType type = GeneratorType.getFromMetadata(meta); + + if(type == GeneratorType.ROTATIONAL_COMPLEX) { if(side != 0 && side != 1) { @@ -137,16 +145,13 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return icons[meta][1]; } } - else if(meta == GeneratorType.PRESSURE_DISPERSER.meta) + else if(!type.hasModel) { return icons[meta][0]; } - else if(meta == GeneratorType.ELECTROMAGNETIC_COIL.meta) - { - return icons[meta][0]; + else { + return BASE_ICON; } - - return BASE_ICON; } @Override @@ -504,12 +509,14 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return false; } + + int guiId = GeneratorType.getFromMetadata(metadata).guiId; - if(tileEntity != null) + if(guiId != -1 && tileEntity != null) { if(!entityplayer.isSneaking()) { - entityplayer.openGui(MekanismGenerators.instance, GeneratorType.getFromMetadata(metadata).guiId, world, x, y, z); + entityplayer.openGui(MekanismGenerators.instance, guiId, world, x, y, z); return true; } } @@ -707,7 +714,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB TURBINE_ROTOR(7, "TurbineRotor", -1, -1, TileEntityTurbineRotor.class, false), ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false), PRESSURE_DISPERSER(9, "PressureDisperser", -1, -1, TileEntityPressureDisperser.class, false), - ELECTROMAGNETIC_COIL(10, "ElectromagneticCoil", -1, -1, TileEntityElectromagneticCoil.class, false); + ELECTROMAGNETIC_COIL(10, "ElectromagneticCoil", -1, -1, TileEntityElectromagneticCoil.class, false), + TURBINE_CASING(11, "TurbineCasing", -1, -1, TileEntityTurbineCasing.class, false), + TURBINE_VALVE(12, "TurbineValve", -1, -1, TileEntityTurbineValve.class, false), + TURBINE_VENT(13, "TurbineVent", -1, -1, TileEntityTurbineVent.class, false); public int meta; public String name; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java new file mode 100644 index 000000000..34d3f7000 --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -0,0 +1,9 @@ +package mekanism.generators.common.tile.turbine; + +public class TileEntityTurbineValve extends TileEntityTurbineCasing +{ + public TileEntityTurbineValve() + { + super("TurbineValve"); + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 475c2c82f..a80dfd238 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -740,6 +740,9 @@ tooltip.TurbineRotor=The steel rod that is used to house !nTurbine Blades within tooltip.RotationalComplex=A connector that is placed on the highest !nTurbine Rotor of an Industrial Turbine to !ncarry kinetic energy into its !nElectromagnetic Coils. tooltip.PressureDisperser=A block used in the Industrial Turbine!n to direct steam outwards. These should !nbe placed just above your turbine rods, forming a !ngapless layer of dispersers surrounding your !nRotational Complex. tooltip.ElectromagneticCoil=A block that converts kinetic energy from a !nRotational Complex into useable electricity. These can be placed in !nany arrangement above your Rotational Complex, as long !nas they are all touching each other and the !ncomplex itself. +tooltip.TurbineCasing=Pressure-resistant casing used in the !ncreation of an Industrial Turbine. +tooltip.TurbineValve=A type of Turbine Casing that includes a !nport for the transfer of energy and steam. +tooltip.TurbineVent=A type of Turbine Casing with an integrated !nvent for the release of steam. These !nshould be placed on the level of or above the turbine's !nRotational Complex. tooltip.ReactorGlass=Reinforced glass that can be used in !nthe Fusion Reactor multiblock. tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that !nis capable of absorbing optical energy and !nthereby heating up the Fusion Reactor. @@ -855,6 +858,9 @@ tile.Generator.TurbineRotor.name=Turbine Rotor tile.Generator.RotationalComplex.name=Rotational Complex tile.Generator.PressureDisperser.name=Pressure Disperser tile.Generator.ElectromagneticCoil.name=Electromagnetic Coil +tile.Generator.TurbineCasing.name=Turbine Casing +tile.Generator.TurbineValve.name=Turbine Valve +tile.Generator.TurbineVent.name=Turbine Vent tile.Reactor.ReactorController.name=Reactor Controller tile.Reactor.ReactorFrame.name=Reactor Frame diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png new file mode 100644 index 000000000..58a8410be Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png new file mode 100644 index 000000000..be7474646 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png new file mode 100644 index 000000000..53999ae47 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png new file mode 100644 index 000000000..f7f956737 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png new file mode 100644 index 000000000..358dee714 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png new file mode 100644 index 000000000..e522259ef Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png differ