Fixed

6 files changed, 39 insertions, 35 deletions

diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
index 44f09468a8..64ebf27152 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
@@ -35,6 +35,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     private static Map<Integer, TreeMap<Float, Integer>> mostStableUnstableIsotopes = new HashMap<>();
     private static final Map<Integer, dAtomDefinition> unstableAtoms = new HashMap<>();
     private static cElementalDefinitionStack alpha;
+    private static final HashMap<dAtomDefinition,Float> lifetimeOverrides=new HashMap<>();
 
     //float-mass in eV/c^2
     public final float mass;
@@ -448,8 +449,8 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return transformation.itemDequantization.get(this);
+    public aOredictDequantizationInfo someAmountIntoItemsStack() {
+        return transformation.oredictDequantization.get(this);
     }
 
     private final static class nomenclature {
@@ -498,6 +499,7 @@ public final class dAtomDefinition extends cElementalDefinition {
                 }
             }
 
+        //populate unstable isotopes
         for (int element = 84; element < 150; element++)
             for (int isotope = 100; isotope < 180; isotope++) {
                 xstr.setSeed((long) (element + 1) * (isotope + 100));
@@ -659,26 +661,27 @@ public final class dAtomDefinition extends cElementalDefinition {
         );
 
         try {
-            dAtomDefinition temp=new dAtomDefinition(
-                    eLeptonDefinition.lepton_e1,
-                    dHadronDefinition.hadron_p1,
-                    dHadronDefinition.hadron_n1
-            );
-            transformation.addFluid(new cElementalDefinitionStack(temp, 144),Materials.Deuterium.mGas.getID(), 144);
-
-            temp=new dAtomDefinition(
-                    eLeptonDefinition.lepton_e1,
-                    dHadronDefinition.hadron_p1,
-                    dHadronDefinition.hadron_n2
-            );
-            transformation.addFluid(new cElementalDefinitionStack(temp, 144),Materials.Tritium.mGas.getID(), 144);
-
-            temp=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 2),
-                    dHadronDefinition.hadron_p2,
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 3)
-            );
-            transformation.addFluid(new cElementalDefinitionStack(temp, 144),Materials.Helium_3.mGas.getID(), 144);
+            dAtomDefinition temp;
+            //temp=new dAtomDefinition(
+            //        eLeptonDefinition.lepton_e1,
+            //        dHadronDefinition.hadron_p1,
+            //        dHadronDefinition.hadron_n1
+            //);
+            //transformation.addFluid(new cElementalDefinitionStack(temp, 144),Materials.Deuterium.mGas.getID(), 144);
+
+            //temp=new dAtomDefinition(
+            //        eLeptonDefinition.lepton_e1,
+            //        dHadronDefinition.hadron_p1,
+            //        dHadronDefinition.hadron_n2
+            //);
+            //transformation.addFluid(new cElementalDefinitionStack(temp, 144),Materials.Tritium.mGas.getID(), 144);
+
+            //temp=new dAtomDefinition(
+            //        new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 2),
+            //        dHadronDefinition.hadron_p2,
+            //        new cElementalDefinitionStack(dHadronDefinition.hadron_n, 3)
+            //);
+            //transformation.addFluid(new cElementalDefinitionStack(temp, 144),Materials.Helium_3.mGas.getID(), 144);
 
             temp=new dAtomDefinition(
                     new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 92),
@@ -715,4 +718,6 @@ public final class dAtomDefinition extends cElementalDefinition {
     public int hashCode() {
         return hash;
     }
+
+
 }
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
index b7c7ee8dca..5af32b977b 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
@@ -5,6 +5,7 @@ import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.elementalMatter.classes.*;
 import com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition;
+import com.github.technus.tectech.elementalMatter.interfaces.iExchangeInfo;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
@@ -166,12 +167,12 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
     }
 
     @Override
-    public FluidStack someAmountIntoFluidStack() {
+    public iExchangeInfo someAmountIntoFluidStack() {
         return null;
     }
 
     @Override
-    public ItemStack someAmountIntoItemsStack() {
+    public iExchangeInfo someAmountIntoItemsStack() {
         return null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 3ca9a96f45..4a94679a6d 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -84,7 +84,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             if (stack.definition instanceof ePrimalAspectDefinition) {
                 mEUt = (int) -V[8];
             } else {
-                mEUt = (int) -V[9];
+                mEUt = (int) -V[10];
             }
             return true;
         }
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 44e08fe051..c1783fc774 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -82,12 +82,13 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
             mMaxProgresstime = 20;
             mEfficiencyIncrease = 10000;
             eAmpereFlow=1;
-            outputEM = new cElementalInstanceStackMap[1];
-            outputEM[0] = new cElementalInstanceStackMap(newStack);
+            outputEM = new cElementalInstanceStackMap[]{
+                    new cElementalInstanceStackMap(newStack)
+            };
             if (newStack.definition instanceof ePrimalAspectDefinition) {
                 mEUt = (int) -V[8];
             } else {
-                mEUt = (int) -V[9];
+                mEUt = (int) -V[10];
             }
             return true;
         }
@@ -103,5 +104,6 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
             return;
         }
         eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]);
+        outputEM=null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index f32ecad3dd..8873ebef00 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -116,15 +116,10 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         float euMult = mass / refMass;
         eAmpereFlow = (int) Math.ceil(euMult);
         if (mass > refUnstableMass) {
-            mEUt = (int) -V[9];
+            mEUt = (int) -V[10];
         } else {
             mEUt = (int) -V[8];
         }
-        outputEM = new cElementalInstanceStackMap[]{
-                from instanceof cElementalInstanceStack ?
-                        new cElementalInstanceStackMap((cElementalInstanceStack) from) :
-                        new cElementalInstanceStackMap(new cElementalInstanceStack(from.getDefinition(), from.getAmount()))
-        };
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 11a87ef867..1e01dbdc4e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -138,7 +138,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         float euMult = mass / refMass;
         eAmpereFlow = (int) Math.ceil(euMult);
         if (mass > refUnstableMass) {
-            mEUt = (int) -V[9];
+            mEUt = (int) -V[10];
         } else {
             mEUt = (int) -V[8];
         }
@@ -156,5 +156,6 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             return;
         }
         eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]);
+        outputEM=null;
     }
 }