diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-05-19 16:11:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-19 16:11:12 +0200 |
commit | 79ba5a72aa84a12c6ec14799bf4c0b4c0b1cb627 (patch) | |
tree | f24b54d94a29501c76ba83a897b29e1ce8960dac /src/main/java/gregtech/api/metatileentity/implementations | |
parent | 8274ed5c1a4f64a97fa74a808a579462472c35bb (diff) | |
download | GT5-Unofficial-79ba5a72aa84a12c6ec14799bf4c0b4c0b1cb627.tar.gz GT5-Unofficial-79ba5a72aa84a12c6ec14799bf4c0b4c0b1cb627.tar.bz2 GT5-Unofficial-79ba5a72aa84a12c6ec14799bf4c0b4c0b1cb627.zip |
nuclear control displays 2.0, lang file addition (#120)
* +applied mitchej123 fix to all turbines
+added .lang translation for GUI
+removed error log for quicksilver dust
* Lang file for Multiblock Information
Nuclear Display patch
* Tin Cell dublicate bug https://github.com/GTNewHorizons/NewHorizons/issues/2970
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 727cdda838..e7b37a1cab 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -18,6 +18,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Pollution; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -894,22 +895,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { } return new String[]{ - "Progress:", - EnumChatFormatting.GREEN + Integer.toString(mProgresstime/20) + EnumChatFormatting.RESET +" s / "+ - EnumChatFormatting.YELLOW + Integer.toString(mMaxProgresstime/20) + EnumChatFormatting.RESET +" s", - "Stored Energy:", - EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET +" EU / "+ - EnumChatFormatting.YELLOW + Long.toString(maxEnergy) + EnumChatFormatting.RESET +" EU", - "Probably uses: "+ - EnumChatFormatting.RED + Integer.toString(-mEUt) + EnumChatFormatting.RESET + " EU/t", - "Max Energy Income: "+ - EnumChatFormatting.YELLOW+Long.toString(getMaxInputVoltage())+EnumChatFormatting.RESET+ " EU/t(*2A) Tier: "+ + /* 1*/ I18n.format("GT5U.multiblock.Progress")+": " + EnumChatFormatting.GREEN + Integer.toString(mProgresstime/20) + EnumChatFormatting.RESET +" s / " + + EnumChatFormatting.YELLOW + Integer.toString(mMaxProgresstime/20) + EnumChatFormatting.RESET +" s", + /* 2*/ I18n.format("GT5U.multiblock.energy")+": " + + EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET +" EU / "+ + EnumChatFormatting.YELLOW + Long.toString(maxEnergy) + EnumChatFormatting.RESET +" EU", + /* 3*/ I18n.format("GT5U.multiblock.usage")+": "+ EnumChatFormatting.RED + Integer.toString(-mEUt) + EnumChatFormatting.RESET + " EU/t", + /* 4*/ I18n.format("GT5U.multiblock.mei")+": "+ + EnumChatFormatting.YELLOW+Long.toString(getMaxInputVoltage())+EnumChatFormatting.RESET+ " EU/t(*2A) "+I18n.format("GT5U.machines.tier")+": "+ EnumChatFormatting.YELLOW+VN[GT_Utility.getTier(getMaxInputVoltage())]+ EnumChatFormatting.RESET, - "Problems: "+ + /* 5*/ I18n.format("GT5U.multiblock.problems")+": "+ EnumChatFormatting.RED+ (getIdealStatus() - getRepairStatus())+EnumChatFormatting.RESET+ - " Efficiency: "+ + " "+I18n.format("GT5U.multiblock.efficiency")+": "+ EnumChatFormatting.YELLOW+Float.toString(mEfficiency / 100.0F)+EnumChatFormatting.RESET + " %", - "Pollution reduced to: "+ EnumChatFormatting.GREEN + mPollutionReduction+ EnumChatFormatting.RESET+" %" + /* 6*/ I18n.format("GT5U.multiblock.pollution")+": "+ EnumChatFormatting.GREEN + mPollutionReduction+ EnumChatFormatting.RESET+" %" }; } |