force compound to be grouped together in chemical formula (#1630)

* force compound to be grouped together in chemical formula Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * patch up glass chemical formula Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * merge two toString Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
GTNewHorizons · Jan 4, 2023 · ae916ac · ae916ac
1 parent e647788
commit ae916ac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
@@ -1467,10 +1467,12 @@ public Materials(
                 aColor);
         mExtraData = aExtraData;
         mMaterialList.addAll(aMaterialList);
-        mChemicalFormula = mMaterialList.stream()
-                .map(MaterialStack::toString)
-                .collect(Collectors.joining())
-                .replaceAll("_", "-");
+        if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0).toString(true);
+        else
+            mChemicalFormula = mMaterialList.stream()
+                    .map(MaterialStack::toString)
+                    .collect(Collectors.joining())
+                    .replaceAll("_", "-");
 
         int tAmountOfComponents = 0, tMeltingPoint = 0;
         for (MaterialStack tMaterial : mMaterialList) {

diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -40,17 +40,19 @@ 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)) {
-                temp1 = "(";
-                temp3 = ")";
-            }
         }
-        return String.valueOf(
-                new StringBuilder().append(temp1).append(temp2).append(temp3).append(temp4));
+        if ((!single || mAmount > 1) && isMaterialListComplex(this)) {
+            temp1 = "(";
+            temp3 = ")";
+        }
+        return temp1 + temp2 + temp3 + temp4;
     }
 
     private boolean isMaterialListComplex(MaterialStack materialStack) {