patch up glass chemical formula

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
GTNewHorizons · Jan 4, 2023 · 4cf2a40 · 4cf2a40
1 parent c844b29
commit 4cf2a40
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 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).toStringSingle();
+        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
@@ -51,6 +51,18 @@ public String toString() {
         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;