diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-12-28 18:15:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 18:15:54 +0100 |
| commit | 748fe043379899876ee079d3d414f50b5dfad9b6 (patch) | |
| tree | 1c9b3af776c21a0278fcd3b455300d18f5c9d5ad /src/main/java/gregtech/common/blocks/GT_Item_Machines.java | |
| parent | 5da080296a9a04aaee27bc88036650c8c26820ce (diff) | |
| parent | 7fb679c5bec20dc8caa40b3a92b2a6590912f6f9 (diff) | |
| download | GT5-Unofficial-748fe043379899876ee079d3d414f50b5dfad9b6.tar.gz GT5-Unofficial-748fe043379899876ee079d3d414f50b5dfad9b6.tar.bz2 GT5-Unofficial-748fe043379899876ee079d3d414f50b5dfad9b6.zip | |
Merge pull request #380 from GTNewHorizons/CoilsLogicRework
Heating Coil Logic Overhaul
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_Item_Machines.java')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Machines.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index bf6b12b5cd..57cfe9266c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -65,10 +65,12 @@ public class GT_Item_Machines } if (tTileEntity.getEUCapacity() > 0L) { if (tTileEntity.getInputVoltage() > 0L) { - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY); + int inputTier = GT_Utility.getTier(tTileEntity.getInputVoltage()); + aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.TIER_COLORS[inputTier] + GT_Values.VN[inputTier] + EnumChatFormatting.GREEN +")" + EnumChatFormatting.GRAY); } if (tTileEntity.getOutputVoltage() > 0L) { - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY); + int outputTier = GT_Utility.getTier(tTileEntity.getOutputVoltage()); + aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.TIER_COLORS[outputTier] + GT_Values.VN[outputTier] + EnumChatFormatting.GREEN + ")" + EnumChatFormatting.GRAY); } if (tTileEntity.getOutputAmperage() > 1L) { aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY); |