gt api directory change from bloodasp code

3 files changed, 12 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/objects/ElementStack.java b/src/main/java/gregtech/api/objects/ElementStack.java
index f3e1543614..978e5e65c8 100644
--- a/src/main/java/gregtech/api/objects/ElementStack.java
+++ b/src/main/java/gregtech/api/objects/ElementStack.java
@@ -17,7 +17,7 @@ public class ElementStack implements Cloneable {
 
     @Override
     public ElementStack clone() {
-        return new ElementStack(mElement, mAmount);
+        try { return (ElementStack) super.clone(); } catch (Exception e) { return new ElementStack(mElement, mAmount); }
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java
index e4a39fd532..4609e8e613 100644
--- a/src/main/java/gregtech/api/objects/ItemData.java
+++ b/src/main/java/gregtech/api/objects/ItemData.java
@@ -119,6 +119,6 @@ public class ItemData {
     @Override
     public String toString() {
         if (mPrefix == null || mMaterial == null || mMaterial.mMaterial == null) return "";
-        return mPrefix.name() + mMaterial.mMaterial.name();
+        return String.valueOf(new StringBuilder().append(mPrefix.name()).append(mMaterial.mMaterial.name()));
     }
 }
\ No newline at end of file
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