diff options
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_PreLoad.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 10 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index ceae1ca202..bc5b5f3fb1 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -360,6 +360,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public boolean mNEIRecipeOwnerStackTrace = false; /** + * This enables showing original voltage when overclocked + */ + public boolean mNEIOriginalVoltage = false; + + /** * This enables showing voltage tier of transformer for Waila, instead of raw voltage number */ public boolean mWailaTransformerVoltageTier = true; diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index ad741ea27e..940df67f74 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -538,6 +538,7 @@ public class GT_PreLoad { GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.sClientDataFile.get("nei", "RecipeSecondMode", true); GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.sClientDataFile.get("nei", "RecipeOwner", false); GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.sClientDataFile.get("nei", "RecipeOwnerStackTrace", false); + GT_Mod.gregtechproxy.mNEIOriginalVoltage = GregTech_API.sClientDataFile.get("nei", "OriginalVoltage", false); GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = GregTech_API.sClientDataFile.get("waila", "WailaTransformerVoltageTier", true); final String[] Circuits = GregTech_API.sClientDataFile.get("interface", "CircuitsOrder" ); diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index 7621918481..3b5fbca00c 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -373,6 +373,16 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { if (amperage == null || amperage.equals("unspecified") || powerUsage.contains("(OC)")){ drawLine(lineCounter, GT_Utility.trans("153", "Usage: ") + powerUsage); lineCounter++; + if (GT_Mod.gregtechproxy.mNEIOriginalVoltage) { + Power originalPower = getPowerFromRecipeMap(); + originalPower.computePowerUsageAndDuration(recipe.mEUt, recipe.mDuration); + drawLine(lineCounter, GT_Utility.trans("228", "Original voltage: ") + originalPower.getVoltageString()); + lineCounter++; + } + if (amperage != null && !amperage.equals("unspecified") && !amperage.equals("1")) { + drawLine(lineCounter, GT_Utility.trans("155", "Amperage: ") + amperage); + lineCounter++; + } } else if (amperage.equals("1")) { drawLine(lineCounter, GT_Utility.trans("154", "Voltage: ") + mPower.getVoltageString()); lineCounter++; |