Summing sonstructors

3 files changed, 21 insertions, 24 deletions

diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java
index 0b9aefa8fb..0466d8d747 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java
@@ -20,15 +20,12 @@ public final class cElementalDefinitionStackMap/*IMMUTABLE*/ extends cElementalS
 
     @Deprecated
     public cElementalDefinitionStackMap(iElementalDefinition... in) {
-        map = new TreeMap<>();
-        for (iElementalDefinition definition : in)
-            map.put(definition, new cElementalDefinitionStack(definition, 1));
+        map=cElementalMutableDefinitionStackMap.stackUpMap(in).map;
     }
 
+    @Deprecated
     public cElementalDefinitionStackMap(cElementalDefinitionStack... in) {
-        map = new TreeMap<>();
-        for (cElementalDefinitionStack stack : in)
-            map.put(stack.definition, stack);
+        map=cElementalMutableDefinitionStackMap.stackUpMap(in).map;
     }
 
     public cElementalDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {
@@ -41,14 +38,14 @@ public final class cElementalDefinitionStackMap/*IMMUTABLE*/ extends cElementalS
         return this;
     }
 
-    public cElementalMutableDefinitionStackMap constructMutable() {
+    public cElementalMutableDefinitionStackMap toMutable() {
         return new cElementalMutableDefinitionStackMap(map);
     }
 
     @Override
     @Deprecated//BETTER TO JUST MAKE A MUTABLE VERSION AND DO SHIT ON IT
     public TreeMap<iElementalDefinition, cElementalDefinitionStack> getRawMap() {
-        return constructMutable().getRawMap();
+        return toMutable().getRawMap();
     }
 
     public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
index 883a36c461..aa934aea21 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
@@ -16,25 +16,28 @@ import static com.github.technus.tectech.elementalMatter.definitions.cPrimitiveD
  * Created by danie_000 on 22.01.2017.
  */
 public final class cElementalInstanceStackMap implements Comparable<cElementalInstanceStackMap> {
-    private TreeMap<iElementalDefinition, cElementalInstanceStack> map = new TreeMap<>();
+    private TreeMap<iElementalDefinition, cElementalInstanceStack> map;
 
     //Constructors
     public cElementalInstanceStackMap() {
+        map = new TreeMap<>();
     }
 
+    @Deprecated
     public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) {
         this(true, inSafe);
     }
 
+    @Deprecated
     public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) {
+        map = new TreeMap<>();
         if (clone) {
-            for (cElementalInstanceStack instance : in) {
-                map.put(instance.definition, instance.clone());
-            }
+            cElementalInstanceStack[] stacks=new cElementalInstanceStack[in.length];
+            for(int i=0;i<stacks.length;i++)
+                stacks[i]=in[i].clone();
+            putUnifyAll(stacks);
         } else {
-            for (cElementalInstanceStack instance : in) {
-                map.put(instance.definition, instance);
-            }
+            putUnifyAll(in);
         }
     }
 
@@ -44,9 +47,9 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
 
     private cElementalInstanceStackMap(boolean clone, TreeMap<iElementalDefinition, cElementalInstanceStack> in) {
         if (clone) {
-            for (cElementalInstanceStack instance : in.values()) {
-                map.put(instance.definition, instance.clone());
-            }
+            map = new TreeMap<>();
+            for(cElementalInstanceStack stack:in.values())
+                putUnify(stack.clone());
         } else {
             map = in;
         }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java
index 20885cc1f1..b510d85f1e 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java
@@ -21,15 +21,12 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa
 
     @Deprecated
     public cElementalMutableDefinitionStackMap(iElementalDefinition... in) {
-        map = new TreeMap<>();
-        for (iElementalDefinition definition : in)
-            map.put(definition, new cElementalDefinitionStack(definition, 1));
+        map=stackUpMap(in).map;
     }
 
+    @Deprecated
     public cElementalMutableDefinitionStackMap(cElementalDefinitionStack... in) {
-        map = new TreeMap<>();
-        for (cElementalDefinitionStack stack : in)
-            map.put(stack.definition, stack);
+        map=stackUpMap(in).map;
     }
 
     public cElementalMutableDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {