diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/objects')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java | 12 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index 77ad6cd4ac..967d3ae916 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -22,13 +22,13 @@ public class GregtechItemData { public ItemStack mUnificationTarget = null; public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, - final boolean aBlackListed) { + final boolean aBlackListed) { this.mPrefix = aPrefix; this.mMaterial = aMaterial == null ? null : new GregtechMaterialStack(aMaterial, aPrefix.mMaterialAmount); this.mBlackListed = aBlackListed; this.mByProducts = (aPrefix.mSecondaryMaterial == null) || (aPrefix.mSecondaryMaterial.mMaterial == null) - ? EMPTY_GT_MaterialStack_ARRAY - : new GregtechMaterialStack[] { aPrefix.mSecondaryMaterial.clone() }; + ? EMPTY_GT_MaterialStack_ARRAY + : new GregtechMaterialStack[] { aPrefix.mSecondaryMaterial.clone() }; } public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial) { @@ -43,7 +43,7 @@ public class GregtechItemData { this.mByProducts = EMPTY_GT_MaterialStack_ARRAY; } else { final GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY - : new GregtechMaterialStack[aByProducts.length]; + : new GregtechMaterialStack[aByProducts.length]; int j = 0; for (GregtechMaterialStack aByProduct : aByProducts) { if ((aByProduct != null) && (aByProduct.mMaterial != null)) { @@ -58,12 +58,12 @@ public class GregtechItemData { } public GregtechItemData(final GT_Materials aMaterial, final long aAmount, - final GregtechMaterialStack... aByProducts) { + final GregtechMaterialStack... aByProducts) { this(new GregtechMaterialStack(aMaterial, aAmount), aByProducts); } public GregtechItemData(final GT_Materials aMaterial, final long aAmount, final GT_Materials aByProduct, - final long aByProductAmount) { + final long aByProductAmount) { this(new GregtechMaterialStack(aMaterial, aAmount), new GregtechMaterialStack(aByProduct, aByProductAmount)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java index 5ffdc4d20e..d1ee02f480 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java @@ -34,8 +34,8 @@ public class GregtechMaterialStack implements Cloneable { } if (aObject instanceof GregtechMaterialStack) { return (((GregtechMaterialStack) aObject).mMaterial == this.mMaterial) - && ((this.mAmount < 0) || (((GregtechMaterialStack) aObject).mAmount < 0) - || (((GregtechMaterialStack) aObject).mAmount == this.mAmount)); + && ((this.mAmount < 0) || (((GregtechMaterialStack) aObject).mAmount < 0) + || (((GregtechMaterialStack) aObject).mAmount == this.mAmount)); } return false; } @@ -43,9 +43,9 @@ public class GregtechMaterialStack implements Cloneable { @Override public String toString() { return ((this.mMaterial.mMaterialList.size() > 1) && (this.mAmount > 1) ? "(" : "") - + this.mMaterial.getToolTip(true) - + ((this.mMaterial.mMaterialList.size() > 1) && (this.mAmount > 1) ? ")" : "") - + (this.mAmount > 1 ? this.mAmount : ""); + + this.mMaterial.getToolTip(true) + + ((this.mMaterial.mMaterialList.size() > 1) && (this.mAmount > 1) ? ")" : "") + + (this.mAmount > 1 ? this.mAmount : ""); } @Override |