diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 365618ae1ca..08611d55145 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1467,7 +1467,7 @@ public Materials( aColor); mExtraData = aExtraData; mMaterialList.addAll(aMaterialList); - if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0).toStringSingle(); + if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0).toString(true); else mChemicalFormula = mMaterialList.stream() .map(MaterialStack::toString) diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java index e5ebbee3689..21fee36b170 100644 --- a/src/main/java/gregtech/api/objects/MaterialStack.java +++ b/src/main/java/gregtech/api/objects/MaterialStack.java @@ -40,29 +40,21 @@ public boolean equals(Object aObject) { @Override public String toString() { + return toString(false); + } + + public String toString(boolean single) { String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = ""; if (mAmount > 1) { temp4 = GT_Utility.toSubscript(mAmount); } - if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) { + if ((!single || mAmount > 1) && isMaterialListComplex(this)) { temp1 = "("; temp3 = ")"; } return temp1 + temp2 + temp3 + temp4; } - public String toStringSingle() { - String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = ""; - if (mAmount > 1) { - temp4 = GT_Utility.toSubscript(mAmount); - if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) { - temp1 = "("; - temp3 = ")"; - } - } - return temp1 + temp2 + temp3 + temp4; - } - private boolean isMaterialListComplex(MaterialStack materialStack) { if (materialStack.mMaterial.mMaterialList.size() > 1) { return true;