diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2023-01-05 00:09:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 17:09:52 +0100 |
| commit | ae916ac62a0a75749cfc4a1974d5fb40b6dc7ddf (patch) | |
| tree | 468bed3cd14efaaee518e592fa67aa11c12a6c15 /src/main/java/gregtech/api/enums | |
| parent | e6477881fb2127eb3bfc2a70bf98503563221730 (diff) | |
| download | GT5-Unofficial-ae916ac62a0a75749cfc4a1974d5fb40b6dc7ddf.tar.gz GT5-Unofficial-ae916ac62a0a75749cfc4a1974d5fb40b6dc7ddf.tar.bz2 GT5-Unofficial-ae916ac62a0a75749cfc4a1974d5fb40b6dc7ddf.zip | |
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>
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 7eca124409..08611d5514 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1467,10 +1467,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { 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) { |