merge two toString

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

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git 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
@@ -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;