aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/power
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
commit0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch)
tree1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/common/power
parentf8cc82edeb9810c45cba762d733a2c909a302faa (diff)
downloadGT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/common/power')
-rw-r--r--src/main/java/gregtech/common/power/BasicMachineEUPower.java6
-rw-r--r--src/main/java/gregtech/common/power/EUPower.java1
-rw-r--r--src/main/java/gregtech/common/power/Power.java1
-rw-r--r--src/main/java/gregtech/common/power/SteamPower.java3
-rw-r--r--src/main/java/gregtech/common/power/UnspecifiedEUPower.java1
5 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/power/BasicMachineEUPower.java b/src/main/java/gregtech/common/power/BasicMachineEUPower.java
index 9a858838a9..14f1d27a3f 100644
--- a/src/main/java/gregtech/common/power/BasicMachineEUPower.java
+++ b/src/main/java/gregtech/common/power/BasicMachineEUPower.java
@@ -3,6 +3,7 @@ package gregtech.common.power;
import static gregtech.api.enums.GT_Values.V;
public class BasicMachineEUPower extends EUPower {
+
protected static final String OC = " (OC)";
protected boolean wasOverclocked;
@@ -36,9 +37,8 @@ public class BasicMachineEUPower extends EUPower {
tempEUt <<= 2; // this actually controls overclocking
// xEUt *= 4;//this is effect of everclocking
recipeDuration >>= 1; // this is effect of overclocking
- xEUt = recipeDuration == 0
- ? xEUt >> 1
- : xEUt << 2; // U know, if the time is less than 1 tick make the machine use 2x less power
+ xEUt = recipeDuration == 0 ? xEUt >> 1 : xEUt << 2; // U know, if the time is less than 1 tick make the
+ // machine use 2x less power
}
if (xEUt > Integer.MAX_VALUE - 1) {
recipeEuPerTick = Integer.MAX_VALUE - 1;
diff --git a/src/main/java/gregtech/common/power/EUPower.java b/src/main/java/gregtech/common/power/EUPower.java
index c074cc0b69..815ae0c190 100644
--- a/src/main/java/gregtech/common/power/EUPower.java
+++ b/src/main/java/gregtech/common/power/EUPower.java
@@ -4,6 +4,7 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_Utility;
public class EUPower extends Power {
+
protected final int amperage;
protected int originalVoltage;
diff --git a/src/main/java/gregtech/common/power/Power.java b/src/main/java/gregtech/common/power/Power.java
index d4cd5c5342..13d1cc37c1 100644
--- a/src/main/java/gregtech/common/power/Power.java
+++ b/src/main/java/gregtech/common/power/Power.java
@@ -3,6 +3,7 @@ package gregtech.common.power;
import gregtech.api.util.GT_Utility;
public abstract class Power {
+
protected final byte tier;
protected int recipeEuPerTick;
protected int recipeDuration;
diff --git a/src/main/java/gregtech/common/power/SteamPower.java b/src/main/java/gregtech/common/power/SteamPower.java
index b6fd75850c..c79069e261 100644
--- a/src/main/java/gregtech/common/power/SteamPower.java
+++ b/src/main/java/gregtech/common/power/SteamPower.java
@@ -3,9 +3,10 @@ package gregtech.common.power;
import gregtech.api.util.GT_Utility;
public class SteamPower extends Power {
+
private final double euPerTickOverride;
private final double durationOverride;
- private final String[] STEAM_TIER_NAMES = {"Bronze", "Steel"};
+ private final String[] STEAM_TIER_NAMES = { "Bronze", "Steel" };
public SteamPower(byte tier, double euPerTickMultiplier, double durationMultiplier) {
super(tier);
diff --git a/src/main/java/gregtech/common/power/UnspecifiedEUPower.java b/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
index 5ac85adfee..e411f03613 100644
--- a/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
+++ b/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
@@ -3,6 +3,7 @@ package gregtech.common.power;
import gregtech.api.util.GT_Utility;
public class UnspecifiedEUPower extends EUPower {
+
private final String VOLTAGE = GT_Utility.trans("271", "unspecified");
private final String AMPERAGE = GT_Utility.trans("271", "unspecified");