From 0b1118acb99258d7fe1b4905254a9ba403edf49a Mon Sep 17 00:00:00 2001 From: YannickMG Date: Sun, 26 Jun 2022 15:34:50 -0400 Subject: Re-added null check for null amperage from SteamPower (#1099) * Re-added null check for null amperage from SteamPower * Avoid re-building strings needlessly in drawDescription --- src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index d2eefbd9f3..49382bd859 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -367,18 +367,20 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { drawLine(lineCounter, GT_Utility.trans("152", "Total: ") + mPower.getTotalPowerString()); lineCounter++; - if (mPower.getAmperageString().equals("unspecified") || mPower.getPowerUsageString().contains("(OC)")){ - drawLine(lineCounter, GT_Utility.trans("153", "Usage: ") + mPower.getPowerUsageString()); + String amperage = mPower.getAmperageString(); + String powerUsage = mPower.getPowerUsageString(); + if (amperage == null || amperage.equals("unspecified") || powerUsage.contains("(OC)")){ + drawLine(lineCounter, GT_Utility.trans("153", "Usage: ") + powerUsage); lineCounter++; - } else if (mPower.getAmperageString().equals("1")) { + } else if (amperage.equals("1")) { drawLine(lineCounter, GT_Utility.trans("154", "Voltage: ") + mPower.getVoltageString()); lineCounter++; } else { - drawLine(lineCounter, GT_Utility.trans("153", "Usage: ") + mPower.getPowerUsageString()); + drawLine(lineCounter, GT_Utility.trans("153", "Usage: ") + powerUsage); lineCounter++; drawLine(lineCounter, GT_Utility.trans("154", "Voltage: ") + mPower.getVoltageString()); lineCounter++; - drawLine(lineCounter, GT_Utility.trans("155", "Amperage: ") + mPower.getAmperageString()); + drawLine(lineCounter, GT_Utility.trans("155", "Amperage: ") + amperage); lineCounter++; } -- cgit