diff options
author | Alkalus <draknyte1@hotmail.com> | 2017-07-06 11:50:42 +1000 |
---|---|---|
committer | Alkalus <draknyte1@hotmail.com> | 2017-07-06 11:50:42 +1000 |
commit | 89cbaf872bc166223feb3d0cd3dad0ab2be648c6 (patch) | |
tree | 505144d26e2af2f952275a8db2a755ca63856cfa /src/Java | |
parent | 16213d8ae2bd16421bbe90b16011e75a965f7792 (diff) | |
download | GT5-Unofficial-89cbaf872bc166223feb3d0cd3dad0ab2be648c6.tar.gz GT5-Unofficial-89cbaf872bc166223feb3d0cd3dad0ab2be648c6.tar.bz2 GT5-Unofficial-89cbaf872bc166223feb3d0cd3dad0ab2be648c6.zip |
$ Fixed Chemical Formulae not displaying correctly.
Diffstat (limited to 'src/Java')
-rw-r--r-- | src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java | 7 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/util/Utils.java | 17 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 22db669020..a4c395d850 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -141,12 +141,7 @@ public class BaseItemComponent extends Item{ } if (this.componentMaterial != null){ if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?")) { - if ((this.componentType != ComponentTypes.CELL) || (this.componentType != ComponentTypes.PLASMACELL)){ - list.add(Utils.sanitizeString(this.componentMaterial.vChemicalFormula)); - } - else { - list.add(Utils.sanitizeString(this.componentMaterial.vChemicalFormula)); - } + list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula)); } if (this.componentMaterial.isRadioactive){ diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java index 45dc2ce701..b31c248e22 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/Java/gtPlusPlus/core/util/Utils.java @@ -547,6 +547,23 @@ public class Utils { return output; } + + public static String sanitizeStringKeepBrackets(final String input){ + String temp; + String output; + + temp = input.replace(" ", ""); + temp = temp.replace("-", ""); + temp = temp.replace("_", ""); + temp = temp.replace("?", ""); + temp = temp.replace("!", ""); + temp = temp.replace("@", ""); + temp = temp.replace("#", ""); + temp = temp.replace(" ", ""); + output = temp; + return output; + + } public static String[] parseVersion(final String version){ return parseVersion(version, "//."); |