diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
| commit | 148aa7636d15ccf0593b31f39529aea10eba3c19 (patch) | |
| tree | be6bd89b1566812d7843dc0cb292fc1f841d6079 /src/main/java/gregtech/api/objects/MaterialStack.java | |
| parent | 08217ad00eb35780f2162d5b136a18ef51fe34a1 (diff) | |
| parent | bf25038fc1f45d690c762fcf4e4d2c427aba19fe (diff) | |
| download | GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.gz GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.bz2 GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.zip | |
Merge branch 'Pollution-code' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/objects/MaterialStack.java')
| -rw-r--r-- | src/main/java/gregtech/api/objects/MaterialStack.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java index 5ddb88423a..6066d3cf23 100644 --- a/src/main/java/gregtech/api/objects/MaterialStack.java +++ b/src/main/java/gregtech/api/objects/MaterialStack.java @@ -17,7 +17,7 @@ public class MaterialStack implements Cloneable { @Override public MaterialStack clone() { - return new MaterialStack(mMaterial, mAmount); + try { return (MaterialStack) super.clone(); } catch (Exception e) { return new MaterialStack(mMaterial, mAmount); } } @Override @@ -32,7 +32,15 @@ public class MaterialStack implements Cloneable { @Override public String toString() { - return (mMaterial.mMaterialList.size() > 1 && mAmount > 1 ? "(" : "") + mMaterial.getToolTip(true) + (mMaterial.mMaterialList.size() > 1 && mAmount > 1 ? ")" : "") + (mAmount > 1 ? mAmount : ""); + String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = ""; + if (mAmount > 1) { + temp4 = String.valueOf(mAmount); + if (mMaterial.mMaterialList.size() > 1) { + temp1 = "("; + temp3 = ")"; + } + } + return String.valueOf(new StringBuilder().append(temp1).append(temp2).append(temp3).append(temp4)); } @Override |