From 8e1adc97ea0de15175e78893b823c8145c8b72b4 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 20:08:37 -0500 Subject: [PATCH] Turbine assets completed, added blocks in-game. Still need to add special effect rendering, but that will come later --- .../client/GeneratorsClientProxy.java | 7 ++++ .../common/GeneratorsCommonProxy.java | 6 +++ .../common/block/BlockGenerator.java | 38 +++++++++++------- .../tile/turbine/TileEntityTurbineValve.java | 9 +++++ .../resources/assets/mekanism/lang/en_US.lang | 6 +++ .../textures/blocks/ctm/TurbineCasing-ctm.png | Bin 0 -> 1337 bytes .../textures/blocks/ctm/TurbineCasing.png | Bin 0 -> 1183 bytes .../textures/blocks/ctm/TurbineValve-ctm.png | Bin 0 -> 1537 bytes .../textures/blocks/ctm/TurbineValve.png | Bin 0 -> 1291 bytes .../textures/blocks/ctm/TurbineVent-ctm.png | Bin 0 -> 2182 bytes .../textures/blocks/ctm/TurbineVent.png | Bin 0 -> 1627 bytes 11 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png 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 0000000000000000000000000000000000000000..58a8410be6f6725eee45b300ccd6df1608b415f8 GIT binary patch literal 1337 zcmV-91;+Y`P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z=Sf6CRCodHo52Y}F#toWbO7<7;KiZ5x`Q)&5%eH#pcLHU1@gK;(&WV+5Mqo?GIy%C1j+&M8FT_ppgaL5P!52vfD>>600000NkvXXu0mjf;ah>c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..be74746465b2e6712243623dd6bf993a9da90375 GIT binary patch literal 1183 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 BaN+;} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..358dee71421e6531731aa0743b41d46555ddcde2 GIT binary patch literal 2182 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 IM6N<$g4#?fivR!s literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e522259ef671643744d0d28dce0d5511efab47ba GIT binary patch literal 1627 zcmV-h2Bi6kP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S z2}wjjR9Fe^SItU7K@=WCAwzDNWRXH5gewc(xN#LNTLf+E8G5K*p=G%CE_5S=KbsN@ zf$+?U1irO4>oda} z2R0c9`!!+WASJe=JARNrcW>Q}7U%1L^D`0st}RBRk%-6R!f_l@6p2KLc3%2KGbwA1 z!2xhAlgyS0qx&%S02H-aEs}3Gn*zowm5NKBjA=9)WSnJOzy(aGd~rQJJU&@)C4{w` z5aa%{>rRf2GjN(oxG*w<4CqP_Xb{05qQU}22Grnq>3& zJSorRavoibDV0ie$Giuq92gx4Qr{pL#qOM4x(8U2>(9Kd4@^Da`wXF6HN*x%FR$*1 zeR_P*;*wce!n-$?z$>!a6JrK2WYGEY^BW8X;&b>b5IHZDK*hvjF}~JPV+MHefVSIh zQUog39D58W6$9S1j1C~GLZLudd~S3A(Ja#goGq4NLpo}F zhSt%!ux8RxMa!A=CCC^+fMb3#{#K;itgi!K!~Y)~Zjse;#uBX7oLAe%flUVJ6|D0g Z@*f1)8G^7-91s8i002ovPDHLkV1iZT4*dWC literal 0 HcmV?d00001