aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/power
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-05-27 03:46:44 +0900
committerGitHub <noreply@github.com>2022-05-26 20:46:44 +0200
commit09729c260356d7fe72d71726dd19a39f8382acd2 (patch)
treef09ce3279ef20f039c794575150684d33961f247 /src/main/java/gregtech/common/power
parent33031dc9d4c8a98e18606977c64d809a0a6107cf (diff)
downloadGT5-Unofficial-09729c260356d7fe72d71726dd19a39f8382acd2.tar.gz
GT5-Unofficial-09729c260356d7fe72d71726dd19a39f8382acd2.tar.bz2
GT5-Unofficial-09729c260356d7fe72d71726dd19a39f8382acd2.zip
Fix crash with multi amperage recipe & improve Mass Fabricator NEI (#1053)
Diffstat (limited to 'src/main/java/gregtech/common/power')
-rw-r--r--src/main/java/gregtech/common/power/BasicMachineEUPower.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/power/BasicMachineEUPower.java b/src/main/java/gregtech/common/power/BasicMachineEUPower.java
index 12691ac6d9..aad3a72718 100644
--- a/src/main/java/gregtech/common/power/BasicMachineEUPower.java
+++ b/src/main/java/gregtech/common/power/BasicMachineEUPower.java
@@ -1,12 +1,10 @@
package gregtech.common.power;
-import gregtech.api.util.GT_Utility;
-
import static gregtech.api.enums.GT_Values.V;
-public class BasicMachineEUPower extends EUPower{
- private static final String OC = " (OC)";
- private boolean wasOverclocked;
+public class BasicMachineEUPower extends EUPower {
+ protected static final String OC = " (OC)";
+ protected boolean wasOverclocked;
public BasicMachineEUPower(byte tier, int amperage) {
super(tier, amperage);
@@ -59,14 +57,14 @@ public class BasicMachineEUPower extends EUPower{
return decorateWithOverclockLabel(super.getPowerUsageString());
}
- private String decorateWithOverclockLabel(String s) {
+ protected String decorateWithOverclockLabel(String s) {
if (wasOverclocked) {
s += OC;
}
return s;
}
- private boolean checkIfOverclocked() {
+ protected boolean checkIfOverclocked() {
return originalVoltage != computeVoltageForEuRate(recipeEuPerTick);
}
}