diff options
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, "//."); |