diff options
| author | Blood-Asp <Blood@Asp> | 2015-05-25 23:04:14 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-05-25 23:04:14 +0200 |
| commit | adb4a5eef6c1abf5f2ce68d133d7f54c16939442 (patch) | |
| tree | a9304e34720072cbcf3a59764599f85d50ce6712 /main/java/gregtech/api/items | |
| parent | a102e63891d2af3452dc9b25d9fd97bc266582b7 (diff) | |
| download | GT5-Unofficial-adb4a5eef6c1abf5f2ce68d133d7f54c16939442.tar.gz GT5-Unofficial-adb4a5eef6c1abf5f2ce68d133d7f54c16939442.tar.bz2 GT5-Unofficial-adb4a5eef6c1abf5f2ce68d133d7f54c16939442.zip | |
Update 5.08.17
Large Turbines, Heat exchanger, player detector
Diffstat (limited to 'main/java/gregtech/api/items')
| -rw-r--r-- | main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 2 | ||||
| -rw-r--r-- | main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index d4e13ad232..b574d90f63 100644 --- a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -244,7 +244,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl " + getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY); aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Turbine Efficency: " + EnumChatFormatting.BLUE + (50.0F+(10.0F*getToolCombatDamage(aStack))) + EnumChatFormatting.GRAY); - aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Steam flow: " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed*20) + EnumChatFormatting.GRAY+ "L/sec"); + aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Steam flow: " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed*1000) + EnumChatFormatting.GRAY+ "L/sec"); }else{ aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); diff --git a/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java index 48232b88f0..cee5bb5689 100644 --- a/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java +++ b/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java @@ -78,6 +78,7 @@ import net.minecraft.world.World; checkHeatAcceptor(reactor, x, y + 1, heatAcceptors); while ((heatAcceptors.size() > 0) && (heat > 0)) { + heat *=sEnergy; int dheat = heat / heatAcceptors.size(); heat -= dheat; dheat = ((IReactorComponent)((ItemStackCoord)heatAcceptors.get(0)).stack.getItem()).alterHeat(reactor, ((ItemStackCoord)heatAcceptors.get(0)).stack, ((ItemStackCoord)heatAcceptors.get(0)).x, ((ItemStackCoord)heatAcceptors.get(0)).y, dheat); |