From b3143d1abb9a24ecac96a15fc33c570922c1db59 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 24 Feb 2016 20:29:50 -0500 Subject: [PATCH] Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system --- .../java/mekanism/common/HeatNetwork.java | 15 +++-- src/main/java/mekanism/common/Tier.java | 8 +-- .../mekanism/common/block/BlockMachine.java | 6 +- .../multipart/PartThermodynamicConductor.java | 8 ++- .../common/tile/TileEntityBoilerCasing.java | 27 ++------ .../tile/TileEntityResistiveHeater.java | 62 ++++++++++++++++++ .../TileEntityThermalEvaporationValve.java | 56 +++++++++++++++- .../java/mekanism/common/util/HeatUtils.java | 6 +- .../tile/reactor/TileEntityReactorPort.java | 1 + .../textures/blocks/GlowPlasticBlock.png | Bin 1307 -> 1752 bytes .../mekanism/textures/blocks/PlasticBlock.png | Bin 1332 -> 1719 bytes .../mekanism/textures/blocks/PlasticFence.png | Bin 1332 -> 1478 bytes .../blocks/ReinforcedPlasticBlock.png | Bin 1330 -> 1419 bytes .../textures/blocks/RoadPlasticBlock.png | Bin 1383 -> 1356 bytes .../textures/blocks/SlickPlasticBlock.png | Bin 1332 -> 1478 bytes 15 files changed, 149 insertions(+), 40 deletions(-) create mode 100644 src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index 939178463..0e96fa2d4 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -6,6 +6,9 @@ import java.util.Set; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.common.multipart.MultipartTransmitter; +import mekanism.common.util.MekanismUtils; import cpw.mods.fml.common.FMLCommonHandler; public class HeatNetwork extends DynamicNetwork @@ -40,13 +43,13 @@ public class HeatNetwork extends DynamicNetwork @Override public String getStoredInfo() { - return meanTemp + "K above ambient"; + return MekanismUtils.getTemperatureDisplay(meanTemp, TemperatureUnit.KELVIN) + " above ambient"; } @Override public String getFlowInfo() { - return heatTransferred + " transferred to acceptors, " + heatLost + " lost to environment, " + (heatTransferred + heatLost == 0 ? "" : heatTransferred / (heatTransferred + heatLost) * 100 + "% efficiency"); + return MekanismUtils.getTemperatureDisplay(heatTransferred, TemperatureUnit.KELVIN) + " transferred to acceptors, " + MekanismUtils.getTemperatureDisplay(heatLost, TemperatureUnit.KELVIN) + " lost to environment, " + (heatTransferred + heatLost == 0 ? "" : heatTransferred / (heatTransferred + heatLost) * 100 + "% efficiency"); } @Override @@ -74,9 +77,9 @@ public class HeatNetwork extends DynamicNetwork { for(IGridTransmitter transmitter : transmitters) { - if(transmitter instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { - IHeatTransfer heatTransmitter = (IHeatTransfer)transmitter; + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); double[] d = heatTransmitter.simulateHeat(); newHeatTransferred += d[0]; newHeatLost += d[1]; @@ -85,9 +88,9 @@ public class HeatNetwork extends DynamicNetwork for(IGridTransmitter transmitter : transmitters) { - if(transmitter instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { - IHeatTransfer heatTransmitter = (IHeatTransfer)transmitter; + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); newSumTemp += heatTransmitter.applyTemperatureChange(); } } diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 8d86122f3..e697be2be 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -484,10 +484,10 @@ public final class Tier public static enum ConductorTier { - BASIC(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), - ADVANCED(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), - ELITE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), - ULTIMATE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); + BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), + ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), + ELITE(5, 1, 8000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), + ULTIMATE(5, 1, 100000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); public BaseTier getBaseTier() { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 7cfe78d1b..269629ddf 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -77,6 +77,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; @@ -1144,7 +1145,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo ENTANGLED_BLOCK(MachineBlock.MACHINE_BLOCK_3, 0, "EntangledBlock", 46, TileEntityEntangledBlock.class, true, false, false), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), - OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false); + OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, true, false); public MachineBlock typeBlock; public int meta; @@ -1195,7 +1197,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR) + if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR && type != RESISTIVE_HEATER) { ret.add(type); } diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index bba2e1d22..3a812fab7 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -121,9 +121,13 @@ public class PartThermodynamicConductor extends PartTransmitterQnSVl*BQ+*Yph6}I)>&MOv)2k+*;|*XiJy^v4sKD0NmX?;*RvKtp zYg-$XU|JE4*4EZWhYEs0XEGQ}CS)rCMkbTRVzo2dnXGnJI|RF()6V9w*&GgJD*;9h zhs))5a634VLGU{G9UXk&d_IrI=RpC)=XZ8?3itwkrvRitAOv&?y95GY-NG(FH=qY9 zKyR-|+$#cz#o|8Def@xe{sE`~gM*R*i3GSrIt10wie&QFG6=b1SfNl14-b!wj6fQN z7#kfM836`(15mzEjzOkWs#GfFxKcH)QjL#KOaKE+s3+Cx$w{?FJvF6)YFeY2o|>Kk zXlJz3GqYO2taf&8er^tEVSZ7kThJ{oEb72R{Li;@1K1`+E;x-*dPr<03}#{hX%*~N zr43kILquZ&*No^JS(Hc@S=X1Q ziN5WVQ~J(0AU!*$tfVkfgsKeHyOdOPozo2xadjB!X<^|i{rg5m8Mr4%jd$^_Y@Tw- z;O3EV=DM#Y3EX_u&S}0pODaV6Y;`1-;0V5PFc<9iNopw{Kh`5eiZR{Gj()_*8O&ZDkwe8 zcSE#oanpCk`t)CAWRc58+*Ii%dl4V`;p0AbKPxBS4CF?Sy`p2(;GNwHCSAN0idU7Q{dN+3RYoP1!$-kZ65@{(7* z^zHk`5`=U%nc!A8T9k#P=ji0)|4e9g>4ZBFkSB)o- Rk3v5ObYK|j@!n%+{{vXT>;3=$ delta 1260 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 delta 1282 zcmV+d1^xPq3$hB38Gi-<0047(dh`GQ1N3P_Lr_UWLm*IcZ)Rz1WdHzp+KrUYZxm%1 z$3MIC&a4SI2U7uy!HGYBkV3X#kOo0_yUVsv%VyhR+nAW`?AzV3)7kNz+43VjanT#7 ze}IY{JeYVg!Cw(Bz(E5EK|^dvOgNPIBSaD|hSbAMcL!+2_kZ-v^M0T2_xn8WlYz|V zRo{2h7R-8~s+989_{5}@xj~v|SVK2!s&?S#%H<(|s_(lza_;?13gFuImGA%atf|Ss zhSU>4vliI1kU9psYx^n$;})>zXy}KKc^2qW;}esR$pT&VC@uh9Q&Bt)bg9uwKV)3M zv>VkLWafdMseeSio`@q40Cbh4CzWGcl~Ud+tLC)h%7op=T>sBA>$aBlHUVpcnUO=l zR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca=bm z=R~7_IO5UNJJo|_pc}OJRkLz9@~oYaZmAOSYZv{n9DC3fJ$HC0;uNL~iX+SUurWFi z)r#Gr8jWkkWh};At*T-v;t_vKZ!G52H`JI*=cAMv2T1YG^93g+YyS25W zcT&CW*jG;7d7!%ah-bO%CpiHEX4=T@$^I|Re}A{3!*N}ld+XZTOY};n7Us9#EY2PIq^1>?^14 z$oGct4Rf-mlg<8;{WE(#`)T%U_V9}@3pVBZ?qq=wDZ~p?Fa3m_NDf1 z;(x7H-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v3+Bf5yCwCKy*NzZ zwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh4$IhP^clUzK_l1k zXKXPFMxU|8C_b=t_9`971S;9*cBYU7%zvP8m_ywPGJ$pxwRdroUIrT;uSV{&`&B@vh#wRAN=ofvrLJCN&yVA*pZ@|94K)c$>O}5~R z0M@_U$!+b1r$2^syX}^mi~sql)K3sh@7fuCt<8geb7|@BX2^U9_di%#`sd8j(jxuO zKwE(G?!Q?8ad_2KDscb+00v@9M??Vs0RI60puMM)ks&L8zez+vR9M5^mrD|ZAPhhy z(@St*PRy|4*F}c~sgY1ECT1mO9Ok_Q5aXPy+eDO7cHaZQVcr{Qn?T-@vc6$HY`#u7Q7%pH*vj@#?@$l&;S4c07*qoM6N<$f-NYK&;S4c diff --git a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png old mode 100644 new mode 100755 index a39951d85b1b037e78ff5a7497b0db44dd457a6e..3e2207a71a15751fd6542cfc4cf723f58ae30dbc GIT binary patch delta 1310 zcmV+(1>ySV3d{KKrdh34%awA?s@3at%eI@%X6L0-E|-4| z)A+~d3kHMHXfzxS#p1DKG8qbm0)c@4!5@xiM?2R^ywRW=pTN;;KPPBoa}g-K8(*^SP#f z9O+w4pC0Kv;dd^V`|hOsJxxDz5@T2mUMbP?MR&D3D`&IaX!;ELQs_JxkH^Jg@#j9- zmfdK&PFA3s(D`2cF^*}9r)JI6^r@yh8|Yg5=RwmkP3YV0h7ZpdbJS6<>1BUSw;Ry4 z_Lq*PW17&L%?9+R(VQpc5$Zja_R!z z7tIE*p!@tjB`ZDi-F4x?f+9%TqHV%J=gXh#U_4bclH9YOjdc$sa+NE-d!$I#VS?MqI)t56u z=ShFi&*gJR?U!`Rb4KVGLyv~SA>Bn(Z+06xRd!Xh%dQH2HfM)c%a7$~G@^^NQcmA- zS4F#a=18wp*&z!$M^eeVvyQx^PeeO=v~3ZV^h*=~U&e)F8#^9|XeXGa4<+9mAvA_;vAX5Okj%&$xGLrZFfscXU52@!A z|Dk8{g@Sm3_DnYOAD`*CbSB;H z^)OAJ{Ebd{8t+@e>yCHN6ZQ0%f*uNoVYwOkfB8;|;SAcBZm!&%A3F6cOUZ1yNZ>2^ z&J%tQ1_RN4bAAXx5vokSd-9zpYzZ!3(67%ANe;#Q>F7r|CJJrXw$XzdAptCpi>X4)*z;e8)yk z#{1hl^n2z9^|+$sKJyFxN51nUo6B;Ve)i0-^MiVFNp}(Vi+l2&Y7RVIq?O(=KO|F? zdwYqWb>!82x9e7=QW=hhp6|Ej2lcI1OUXUb)sFaM0)KyL|H^kVk}^CI`px+vnW{Kt z+#^rEYxk delta 1336 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