aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAbdiel Kavash <19243993+AbdielKavash@users.noreply.github.com>2024-03-28 06:40:11 -0600
committerGitHub <noreply@github.com>2024-03-28 13:40:11 +0100
commit9f050f717c33236a845d7e03bbef7425c0911dd7 (patch)
tree885d8638d273aa1bb2438d0b6463fac44fe1a0a3 /src/main
parent54a75bbec0ea90a5699e2c962cfb6b42b2efeec3 (diff)
downloadGT5-Unofficial-9f050f717c33236a845d7e03bbef7425c0911dd7.tar.gz
GT5-Unofficial-9f050f717c33236a845d7e03bbef7425c0911dd7.tar.bz2
GT5-Unofficial-9f050f717c33236a845d7e03bbef7425c0911dd7.zip
Show amperes in/out in tooltip of energy hatches. (#279)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java9
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
index 747c34f54b..c698a4d3a2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
@@ -3,10 +3,10 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch;
import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
import static com.github.technus.tectech.util.CommonValues.V;
import static net.minecraft.util.StatCollector.translateToLocal;
+import static net.minecraft.util.StatCollector.translateToLocalFormatted;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.ForgeDirection;
import com.github.technus.tectech.util.CommonValues;
@@ -16,7 +16,6 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.util.GT_Utility;
/**
* Created by danie_000 on 16.12.2016.
@@ -34,10 +33,8 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch
0,
new String[] { CommonValues.TEC_MARK_GENERAL,
translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"),
- translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": "
- + EnumChatFormatting.AQUA
- + GT_Utility.formatNumbers(aAmp)
- + " A" }); // Multiple Ampere Energy Injector for Multiblocks
+ translateToLocalFormatted("gt.blockmachines.hatch.energymulti.desc.2", aAmp + (aAmp >> 2)),
+ translateToLocalFormatted("gt.blockmachines.hatch.energymulti.desc.3", aAmp) });
Amperes = aAmp;
TT_Utility.setTier(aTier, this);
}
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 1941e3f886..38fec96329 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -228,6 +228,8 @@ gt.blockmachines.hatch.energymulti16.tier.13.name=UXV 16A Energy Hatch
gt.blockmachines.hatch.energymulti64.tier.13.name=UXV 64A Energy Hatch
gt.blockmachines.hatch.energymulti.desc.0=Multiple Ampere Energy Injector for Multiblocks
gt.blockmachines.hatch.energymulti.desc.1=Amperes In
+gt.blockmachines.hatch.energymulti.desc.2=Accepts up to %d Amps from energy network
+gt.blockmachines.hatch.energymulti.desc.3=Provides up to %d Amps to the multiblock
achievement.gt.blockmachines.hatch.energywirelessmulti04.tier.04=EV 4A Wireless Energy Hatch
achievement.gt.blockmachines.hatch.energywirelessmulti16.tier.04=EV 16A Wireless Energy Hatch