aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/power
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2022-06-10 10:15:08 +0100
committerGitHub <noreply@github.com>2022-06-10 11:15:08 +0200
commita894c865281c0d8875600dbe6125231421424ad5 (patch)
tree7fbe19c93dbfcf12c84fd35ee5f30fb10b26092b /src/main/java/gregtech/common/power
parent6ced738344fbf1b2bfccc2b753cf52c4d720e408 (diff)
downloadGT5-Unofficial-a894c865281c0d8875600dbe6125231421424ad5.tar.gz
GT5-Unofficial-a894c865281c0d8875600dbe6125231421424ad5.tar.bz2
GT5-Unofficial-a894c865281c0d8875600dbe6125231421424ad5.zip
Adjust NEI recipe pages (#1077)
* Add config support for changes. * Change ticks config to default OFF. * Usage -> Voltage for some cases. Also fix language translations. * Remove comment. * Remove redundant null check. * Bring back null checks (crashes). Move config to client. Adjust priorities so that if OC is detected it will display usage instead of voltage. * Remove null checks again (but for realsies this time). * Add language localisation. * Update language localisation. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common/power')
-rw-r--r--src/main/java/gregtech/common/power/Power.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/power/Power.java b/src/main/java/gregtech/common/power/Power.java
index e0526c14aa..eac33e7997 100644
--- a/src/main/java/gregtech/common/power/Power.java
+++ b/src/main/java/gregtech/common/power/Power.java
@@ -34,10 +34,14 @@ public abstract class Power {
return 0.05d * getDurationTicks();
}
- public String getDurationString() {
+ public String getDurationStringSeconds() {
return GT_Utility.formatNumbers(getDurationSeconds()) + GT_Utility.trans("161", " secs");
}
+ public String getDurationStringTicks() {
+ return GT_Utility.formatNumbers(getDurationTicks()) + GT_Utility.trans("224", " ticks");
+ }
+
public abstract String getTotalPowerString();
public abstract String getPowerUsageString();