diff options
author | Dream-Master <dream-master@gmx.net> | 2017-06-24 20:36:08 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2017-06-24 20:36:08 +0200 |
commit | de5992daf970326153eb713fe7587d044eae2fda (patch) | |
tree | bae77aa181a1c955d5bacfb1f8716315d0c9639e /src/main/java/gregtech/api/objects/MaterialStack.java | |
parent | e401ef5f788e131114b618a140a562e2633faa2a (diff) | |
parent | c2eaf942e3d2fc62272caa27162a6ad253af153d (diff) | |
download | GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.gz GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.bz2 GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.zip |
Merge branch 'BrickedBlastFurnace' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/objects/MaterialStack.java')
-rw-r--r-- | src/main/java/gregtech/api/objects/MaterialStack.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java index 62adefa35b..8dbcbd6dd6 100644 --- a/src/main/java/gregtech/api/objects/MaterialStack.java +++ b/src/main/java/gregtech/api/objects/MaterialStack.java @@ -1,5 +1,7 @@ package gregtech.api.objects; +import java.util.List; + import gregtech.api.enums.Materials; public class MaterialStack implements Cloneable { @@ -35,7 +37,8 @@ public class MaterialStack implements Cloneable { String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = ""; if (mAmount > 1) { temp4 = String.valueOf(mAmount); - if (mMaterial.mMaterialList.size() > 1 || (mMaterial.mMaterialList.size() == 1 && mMaterial.mElement == null)) { + + if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) { temp1 = "("; temp3 = ")"; } @@ -43,6 +46,16 @@ public class MaterialStack implements Cloneable { return String.valueOf(new StringBuilder().append(temp1).append(temp2).append(temp3).append(temp4)); } + private boolean isMaterialListComplex(MaterialStack materialStack){ + if (materialStack.mMaterial.mMaterialList.size() > 1) { + return true; + } + if (materialStack.mMaterial.mMaterialList.size() == 0) { + return false; + } + return isMaterialListComplex(materialStack.mMaterial.mMaterialList.get(0)); + } + @Override public int hashCode() { return mMaterial.hashCode(); |