diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
4 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java index 666de12f53..1ee1b79cdd 100644 --- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java @@ -651,7 +651,7 @@ public final class ELEMENT { 40, 51, true, - "⚷⚙⚷ Ni4Ti6", + StringUtils.subscript("⚷⚙⚷ Ni4Ti6"), 0); // Not a GT Inherited Material public static final Material HYPOGEN = new Material( "Hypogen", diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 1d926742cb..6e1c9b8b92 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -1342,7 +1342,8 @@ public class Material { if (!aChemSymbol.equals("??")) { if (dummyFormulaArray[e] > 1) { - if (aChemFormula.length() > 3) { + if (aChemFormula.length() > 3 + || StringUtils.uppercaseCount(aChemFormula) > 1) { dummyFormula = dummyFormula + "(" + aChemFormula + ")" @@ -1351,7 +1352,8 @@ public class Material { dummyFormula = dummyFormula + aChemFormula + dummyFormulaArray[e]; } } else if (dummyFormulaArray[e] == 1) { - if (aChemFormula.length() > 3) { + if (aChemFormula.length() > 3 + || StringUtils.uppercaseCount(aChemFormula) > 1) { dummyFormula = dummyFormula + "(" + aChemFormula + ")"; } else { dummyFormula = dummyFormula + aChemFormula; diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index fab71be1bf..0e2e0b7e76 100644 --- a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -95,7 +95,7 @@ public class FLUORIDES { -1, -1, false, - "ZrF4", + "ZrF\u2084", -1, true, false, @@ -169,7 +169,7 @@ public class FLUORIDES { new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2) }); - // (NH4)2Be(OH)2 / (NH4)2BeF4 + // (NH4)2BeF4 public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material( "Ammonium Tetrafluoroberyllate", // Material Name MaterialState.PURE_LIQUID, // State @@ -181,7 +181,8 @@ public class FLUORIDES { false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 2), - new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1) }); + new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); // LFTR Output public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material( diff --git a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java index d837901ea8..76cd82b096 100644 --- a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java @@ -222,4 +222,8 @@ public class StringUtils { return aFound; } } + + public static long uppercaseCount(String aString) { + return aString.chars().filter((c) -> Character.isUpperCase(c)).count(); + } } |