Pushing a blob of code...

27 files changed, 274 insertions, 165 deletions

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java
index da0bb07ff0..07603114ed 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java
@@ -30,7 +30,7 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
 
         ArrayList<Aspect> list=Aspect.getCompoundAspects();
         Aspect[] array=list.toArray(new Aspect[0]);
-        while (!list.isEmpty()) {
+        while (list.size()>0) {
             for (Aspect aspect : array) {
                 if (list.contains(aspect)) {
                     Aspect[] content = aspect.getComponents();
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
index 3b4a08c703..0643153fbf 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
@@ -63,11 +63,11 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
 
     //public but u can just try{}catch(){} the constructor it still calls this method
     private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
-        int amount = 0;
+        long amount = 0;
         for (cElementalDefinitionStack aspects : stacks.values()) {
-            if (aspects.definition instanceof dComplexAspectDefinition || aspects.definition instanceof ePrimalAspectDefinition)
-                amount += aspects.amount;
-            else return false;
+            if (!(aspects.definition instanceof dComplexAspectDefinition) && !(aspects.definition instanceof ePrimalAspectDefinition))
+                return false;
+            amount += aspects.amount;
         }
         return amount==2;
     }
@@ -126,11 +126,16 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
     }
 
     @Override
-    public float getRawLifeTime() {
+    public float getRawTimeSpan() {
         return -1;
     }
 
     @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+
+    @Override
     public int getCharge() {
         return 0;
     }
@@ -151,11 +156,16 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
     }
 
     @Override
-    public cElementalDecay[] getEnergeticDecayInstant() {
+    public cElementalDecay[] getEnergyInducedDecay(long energy) {
         return new cElementalDecay[]{new cElementalDecay(0.75F, aspectStacks), eBosonDefinition.deadEnd};
     }
 
     @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
     public cElementalDecay[] getNaturalDecayInstant() {
         return noDecay;
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java
index 1131c2a4ce..6205055967 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java
@@ -38,5 +38,10 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement
     public Object materializeIntoAspect() {
         return aspectDefinitionCompat.getAspect(this);
     }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
 }
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java
index ae38be4d3e..b6a8b4c2d0 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java
@@ -48,11 +48,11 @@ public final class cElementalDecay {
         this.probability = probability;
     }
 
-    public cElementalInstanceStackMap getResults(float lifeMult, long age, int energy, int amountDecaying) {
+    public cElementalInstanceStackMap getResults(float lifeMult, long age, long energy, long amountDecaying) {
         cElementalInstanceStackMap decayResult = new cElementalInstanceStackMap();
         if (outputStacks == null) return decayResult;//This is to prevent null pointer exceptions.
         //Deny decay code is in instance!
-        int qtty = 0;
+        long qtty = 0;
         for (cElementalDefinitionStack stack : outputStacks.values()) qtty += stack.amount;
         if (qtty <= 0) return decayResult;
         //energy /= qtty;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java
index b0edc510b6..cd5735405e 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java
@@ -125,7 +125,7 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
         if (testOnly)
             return target.amount >= instance.amount;
         else {
-            final int diff = target.amount - instance.amount;
+            final long diff = target.amount - instance.amount;
             if (diff > 0) {
                 target.amount = diff;
                 return true;
@@ -144,7 +144,7 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
         if (testOnly)
             return target.amount >= stack.getAmount();
         else {
-            final int diff = target.amount - stack.getAmount();
+            final long diff = target.amount - stack.getAmount();
             if (diff > 0) {
                 target.amount = diff;
                 return true;
@@ -198,7 +198,7 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
     }
 
     //Remove overflow
-    public float removeOverflow(int stacksCount, int stackCapacity) {
+    public float removeOverflow(int stacksCount, long stackCapacity) {
         float massRemoved = 0;
 
         if (map.size() > stacksCount) {
@@ -320,32 +320,23 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
     }
 
     //Tick Content
-    public void tickContent(float lifeTimeMult, int postEnergize) {
-        for (cElementalInstanceStack instance : this.values()) {
-            cElementalInstanceStackMap newThings = instance.decay(lifeTimeMult, instance.age += 20, postEnergize);
-            if (newThings == null) {
-                instance.nextColor();
-            } else {
-                map.remove(instance.definition);
-                for (cElementalInstanceStack newInstance : newThings.values())
-                    putUnify(newInstance);
-            }
-        }
-
+    public void tickContentByOneSecond(float lifeTimeMult, int postEnergize) {
+        tickContent(lifeTimeMult,postEnergize,1);
     }
 
-    public void tickContent(int postEnergize) {
+    public void tickContent(float lifeTimeMult, int postEnergize, int seconds){
         for (cElementalInstanceStack instance : this.values()) {
-            cElementalInstanceStackMap newThings = instance.decay(instance.age += 20, postEnergize);
-            if (newThings == null) {
+            cElementalInstanceStackMap newInstances = instance.decay(lifeTimeMult, instance.age += seconds, postEnergize);
+            if (newInstances == null) {
                 instance.nextColor();
             } else {
                 map.remove(instance.definition);
-                for (cElementalInstanceStack newInstance : newThings.values())
+                for (cElementalInstanceStack newInstance : newInstances.values()) {
                     putUnify(newInstance);
+                    newInstance.nextColor();
+                }
             }
         }
-
     }
 
     //NBT
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java
index 2873dfefd2..a20b1c2ddb 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java
@@ -94,7 +94,7 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa
         if (testOnly)
             return target.amount >= instance.amount;
         else {
-            final int diff = target.amount - instance.amount;
+            final long diff = target.amount - instance.amount;
             if (diff > 0) {
                 map.put(target.definition, new cElementalDefinitionStack(target.definition, diff));
                 return true;
@@ -113,7 +113,7 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa
         if (testOnly)
             return target.amount >= stack.getAmount();
         else {
-            final int diff = target.amount - stack.getAmount();
+            final long diff = target.amount - stack.getAmount();
             if (diff > 0) {
                 map.put(target.definition, new cElementalDefinitionStack(target.definition, diff));
                 return true;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java
index 408e62621d..55446e9c93 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java
@@ -118,7 +118,7 @@ abstract class cElementalStackMap implements Comparable<cElementalStackMap> {
     }
 
     @Override
-    public int hashCode() {//Hash only definitions to compare contents not amounts or data
+    public final int hashCode() {//Hash only definitions to compare contents not amounts or data
         int hash = -(map.size() << 4);
         for (cElementalDefinitionStack s : map.values()) {
             hash += s.definition.hashCode();
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalDefinitionStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalDefinitionStack.java
index 8a9d855e7e..1e3f79573e 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalDefinitionStack.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalDefinitionStack.java
@@ -12,9 +12,9 @@ import static com.github.technus.tectech.elementalMatter.definitions.primitive.c
  */
 public final class cElementalDefinitionStack implements iHasElementalDefinition {
     public final iElementalDefinition definition;
-    public final int amount;
+    public final long amount;
 
-    public cElementalDefinitionStack(iElementalDefinition def, int amount) {
+    public cElementalDefinitionStack(iElementalDefinition def, long amount) {
         this.definition = def == null ? null__ : def;
         this.amount = amount;
     }
@@ -30,11 +30,11 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
     }
 
     @Override
-    public int getAmount() {
+    public long getAmount() {
         return amount;
     }
 
-    public int getCharge() {
+    public long getCharge() {
         return definition.getCharge() * amount;
     }
 
@@ -45,24 +45,24 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
     public NBTTagCompound toNBT() {
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setTag("d", definition.toNBT());
-        nbt.setInteger("q", amount);
+        nbt.setLong("q", amount);
         return nbt;
     }
 
     public static cElementalDefinitionStack fromNBT(NBTTagCompound nbt) {
         return new cElementalDefinitionStack(
                 cElementalDefinition.fromNBT(nbt.getCompoundTag("d")),
-                nbt.getInteger("q"));
+                nbt.getLong("q"));
     }
 
-    public cElementalDefinitionStack addAmountIntoNewInstance(int amount) {
+    public cElementalDefinitionStack addAmountIntoNewInstance(long amount) {
         if(amount==0) return this;
         return new cElementalDefinitionStack(definition, amount + this.amount);
     }
 
     public cElementalDefinitionStack addAmountIntoNewInstance(cElementalDefinitionStack... other) {
         if (other == null || other.length == 0) return this;
-        int i = 0;
+        long i = 0;
         for (cElementalDefinitionStack stack : other)
             i += stack.amount;
         return addAmountIntoNewInstance(i);
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalInstanceStack.java
index 9864376c25..afc0bb2678 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/containers/cElementalInstanceStack.java
@@ -16,11 +16,11 @@ import static com.github.technus.tectech.elementalMatter.definitions.primitive.c
 public final class cElementalInstanceStack implements iHasElementalDefinition {
     public final iElementalDefinition definition;
     //energy - if positive then particle should try to decay
-    public int energy;
+    public long energy;
     //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
     private byte color;
     public long age;
-    public int amount;
+    public long amount;
     private float lifeTime;
     private float lifeTimeMult;
 
@@ -28,15 +28,15 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         this(stackSafe.definition, stackSafe.amount, 1F, 0, 0);
     }
 
-    public cElementalInstanceStack(cElementalDefinitionStack stackSafe, float lifeTimeMult, long age, int energy) {
+    public cElementalInstanceStack(cElementalDefinitionStack stackSafe, float lifeTimeMult, long age, long energy) {
         this(stackSafe.definition, stackSafe.amount, lifeTimeMult, age, energy);
     }
 
-    public cElementalInstanceStack(iElementalDefinition defSafe, int amount) {
+    public cElementalInstanceStack(iElementalDefinition defSafe, long amount) {
         this(defSafe, amount, 1F, 0, 0);
     }
 
-    public cElementalInstanceStack(iElementalDefinition defSafe, int amount, float lifeTimeMult, long age, int energy) {
+    public cElementalInstanceStack(iElementalDefinition defSafe, long amount, float lifeTimeMult, long age, long energy) {
         this.definition = defSafe == null ? null__ : defSafe;
         byte color = definition.getColor();
         if (color < 0 || color > 2) {//transforms colorable??? into proper color
@@ -45,7 +45,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
             this.color = (byte) (TecTech.Rnd.nextInt(3));
         }
         this.lifeTimeMult = lifeTimeMult;
-        this.lifeTime = definition.getRawLifeTime() * this.lifeTimeMult;
+        this.lifeTime = definition.getRawTimeSpan() * this.lifeTimeMult;
         this.age = age;
         this.energy = energy;
         this.amount = amount;
@@ -68,11 +68,11 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
     }
 
     @Override
-    public int getAmount() {
+    public long getAmount() {
         return amount;
     }
 
-    public int getCharge() {
+    public long getCharge() {
         return definition.getCharge() * amount;
     }
 
@@ -107,9 +107,12 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return lifeTime;
     }
 
-    public float multLifeTime(float mult) {
+    public float setLifeTimeMult(float mult) {
+        if(mult<=0) //since infinity*0=nan
+            throw new IllegalArgumentException("mult must be >0");
         this.lifeTimeMult = mult;
-        this.lifeTime = definition.getRawLifeTime() * mult;
+        if (definition.getRawTimeSpan() <= 0) return this.lifeTime;
+        this.lifeTime = definition.getRawTimeSpan() * this.lifeTimeMult;
         return this.lifeTime;
     }
 
@@ -121,41 +124,68 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return decay(1F, age, 0);//try to decay without changes
     }
 
-    public cElementalInstanceStackMap decay(long apparentAge, int postEnergize) {
+    public cElementalInstanceStackMap decay(long apparentAge, long postEnergize) {
         return decay(1F,apparentAge,postEnergize);
     }
 
-    public cElementalInstanceStackMap decay(Float lifeTimeMult, long apparentAge, int postEnergize) {
-        if (this.energy > 0) {
+    public cElementalInstanceStackMap decay(Float lifeTimeMult, long apparentAge, long postEnergize) {
+        if (this.energy > 0 && !definition.usesSpecialEnergeticDecayHandling()) {
             this.energy--;
-            return decayCompute(definition.getEnergeticDecayInstant(), lifeTimeMult, 0, postEnergize + this.energy);
-        } else if (definition.getRawLifeTime() < 0) {
+            return decayCompute(definition.getEnergyInducedDecay(this.energy), lifeTimeMult, -1, postEnergize + this.energy);
+        }else if (definition.getRawTimeSpan() < 0) {
             return null;//return null, decay cannot be achieved
-        } else if (1F > this.lifeTime) {
-            return decayCompute(definition.getNaturalDecayInstant(), lifeTimeMult, 0, postEnergize + this.energy);
-        } else if (((float) apparentAge) > this.lifeTime) {
-            return decayCompute(definition.getDecayArray(), lifeTimeMult, 0, postEnergize + this.energy);
+        } else if(definition.isTimeSpanHalfLife()){
+            return exponentialDecayCompute(energy>0?definition.getEnergyInducedDecay(this.energy):definition.getDecayArray(), lifeTimeMult, -1, postEnergize + this.energy);
+        } else{
+            if (1F > this.lifeTime) {
+                return decayCompute(energy>0?definition.getEnergyInducedDecay(this.energy):definition.getNaturalDecayInstant(), lifeTimeMult, 0, postEnergize + this.energy);
+            } else if (((float) apparentAge) > this.lifeTime) {
+                return decayCompute(energy>0?definition.getEnergyInducedDecay(this.energy):definition.getDecayArray(), lifeTimeMult, 0, postEnergize + this.energy);
+            }
         }
         return null;//return null since decay cannot be achieved
     }
 
     //Use to get direct decay output providing correct decay array
-    public cElementalInstanceStackMap decayCompute(cElementalDecay[] decays, float lifeTimeMult, long newProductsAge, int energy) {
+    public cElementalInstanceStackMap exponentialDecayCompute(cElementalDecay[] decays, float lifeTimeMult, long newProductsAge, long energy) {
+        double decayInverseRatio=Math.pow(2d,1d/* 1 second *//(double)lifeTime);
+        double newAmount=(double)amount/decayInverseRatio;
+        long amountRemaining=((long)Math.floor(newAmount))+(TecTech.Rnd.nextDouble()<=newAmount-Math.floor(newAmount)?1:0);
+        if(amountRemaining==amount) return null;//nothing decayed
+        else if(amountRemaining<=0) return decayCompute(decays,lifeTimeMult,newProductsAge,energy);
+        //split to non decaying and decaying part
+        amount-=amountRemaining;
+        cElementalInstanceStackMap products=decayCompute(decays,lifeTimeMult,newProductsAge,energy);
+        amount=amountRemaining;
+        products.putUnify(this);
+        return products;
+    }
+
+    //Use to get direct decay output providing correct decay array
+    public cElementalInstanceStackMap decayCompute(cElementalDecay[] decays, float lifeTimeMult, long newProductsAge, long energy) {
         if (decays == null) return null;//Can not decay so it wont
         else if (decays.length == 0)
             return new cElementalInstanceStackMap();//provide non null 0 length array for annihilation
         else if (decays.length == 1) {//only one type of decay :D, doesn't need dead end
-            return decays[0].getResults(lifeTimeMult, newProductsAge, energy, this.amount);
+            cElementalInstanceStackMap products=decays[0].getResults(lifeTimeMult, newProductsAge, energy, this.amount);
+            if(newProductsAge<0){
+                for(cElementalInstanceStack s:products.values()){
+                    if(s.definition.equals(definition)){
+                        s.age=age;
+                    }
+                }
+            }
+            return products;
         } else {
             cElementalInstanceStackMap output = new cElementalInstanceStackMap();
             final int differentDecays = decays.length;
-            int[] qttyOfDecay = new int[differentDecays];
-            int amountRemaining = this.amount, amount = this.amount;
+            long[] qttyOfDecay = new long[differentDecays];
+            long amountRemaining = this.amount, amount = this.amount;
             float remainingProbability = 1F;
 
             for (int i = 0; i < differentDecays; i++) {
                 if (decays[i].probability > 1F) {
-                    int thisDecayAmount = (int) (Math.floor(remainingProbability * (float) amount));
+                    long thisDecayAmount = (long) (Math.floor(remainingProbability * (double) amount));
                     if (thisDecayAmount == 0) {
                         //remainingProbability=something;
                         break;
@@ -170,7 +200,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
                     //remainingProbability=0;
                     break;
                 }
-                int thisDecayAmount = (int) (Math.floor(decays[i].probability * (float) amount));
+                long thisDecayAmount = (long) (Math.floor(decays[i].probability * (double) amount));
                 if (thisDecayAmount <= amountRemaining && thisDecayAmount > 0) {//some was made
                     remainingProbability -= (decays[i].probability);
                     amountRemaining -= thisDecayAmount;
@@ -184,9 +214,9 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
             }
 
             for (int i = 0; i < amountRemaining; i++) {
-                double rand = (double) (TecTech.Rnd.nextFloat());
+                double rand = TecTech.Rnd.nextDouble();
                 for (int j = 0; j < differentDecays; j++) {//looking for the thing it decayed into
-                    rand -= (double) (decays[j].probability);
+                    rand -= decays[j].probability;
                     if (rand <= 0D) {
                         qttyOfDecay[j]++;
                         break;
@@ -198,6 +228,14 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
                 if (qttyOfDecay[i] > 0)
                     output.putUnifyAll(decays[i].getResults(lifeTimeMult, newProductsAge, energy, qttyOfDecay[i]));
             }
+
+            if(newProductsAge<0){
+                for(cElementalInstanceStack s:output.values()){
+                    if(s.definition.equals(definition)){
+                        s.age=age;
+                    }
+                }
+            }
             return output;
         }
     }
@@ -205,7 +243,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
     public cElementalInstanceStack unifyIntoThis(cElementalInstanceStack... instances) {
         if (instances == null) return this;
         //returns with the definition from the first object passed
-        int energy = this.energy * this.amount;
+        long energy = this.energy * this.amount;
         float lifeTimeMul = this.lifeTimeMult;
 
         for (cElementalInstanceStack instance : instances) {
@@ -220,15 +258,15 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         if (amount != 0) energy /= Math.abs(amount);
 
         this.energy = energy;
-        this.multLifeTime(lifeTimeMul);
+        this.setLifeTimeMult(lifeTimeMul);
         return this;
     }
 
     public NBTTagCompound toNBT() {
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setTag("d", definition.toNBT());
-        nbt.setInteger("q", amount);
-        nbt.setInteger("e", energy);
+        nbt.setLong("q", amount);
+        nbt.setLong("e", energy);
         nbt.setByte("c", color);
         nbt.setLong("a", age);
         nbt.setFloat("m", lifeTimeMult);
@@ -239,10 +277,10 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         NBTTagCompound definition = nbt.getCompoundTag("d");
         cElementalInstanceStack instance = new cElementalInstanceStack(
                 cElementalDefinition.fromNBT(definition),
-                nbt.getInteger("q"),
+                nbt.getLong("q"),
                 nbt.getFloat("m"),
                 nbt.getLong("a"),
-                nbt.getInteger("e"));
+                nbt.getLong("e"));
         instance.setColor(nbt.getByte("c"));
         return instance;
     }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java
index e40e2c0a46..98523ffce1 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java
@@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
  */
 public interface iElementalDefinition extends Comparable<iElementalDefinition>,Cloneable {//IMMUTABLE
     float STABLE_RAW_LIFE_TIME =1.5e36f;
+    float NO_DECAY_RAW_LIFE_TIME=-1;
 
     //Nomenclature
     String getName();
@@ -30,7 +31,9 @@ public interface iElementalDefinition extends Comparable<iElementalDefinition>,C
 
     cElementalDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
 
-    cElementalDecay[] getEnergeticDecayInstant();//energetic decay if lifespan <1tick
+    cElementalDecay[] getEnergyInducedDecay(long energy);//energetic decay
+
+    boolean usesSpecialEnergeticDecayHandling();
 
     float getMass();//mass... MeV/c^2
 
@@ -39,7 +42,9 @@ public interface iElementalDefinition extends Comparable<iElementalDefinition>,C
     //dynamically changing stuff
     byte getColor();//-1 nope cannot 0 it can but undefined
 
-    float getRawLifeTime();//defined in static fields or generated
+    float getRawTimeSpan();//defined in static fields or generated
+
+    boolean isTimeSpanHalfLife();
 
     cElementalDefinitionStackMap getSubParticles();//contents... null if none
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iHasElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iHasElementalDefinition.java
index 815af67974..92aac40bf8 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iHasElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iHasElementalDefinition.java
@@ -6,11 +6,11 @@ package com.github.technus.tectech.elementalMatter.core.interfaces;
 public interface iHasElementalDefinition extends Comparable<iHasElementalDefinition>,Cloneable {
     iElementalDefinition getDefinition();
 
-    int getAmount();
+    long getAmount();
 
-    float getMass();
+    long getCharge();
 
-    int getCharge();
+    float getMass();
 
     iHasElementalDefinition clone();
 }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java
index 5f250888b2..d98cd93e04 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java
@@ -108,18 +108,23 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
     }
 
     @Override
-    public cElementalDecay[] getEnergeticDecayInstant() {
+    public cElementalDecay[] getEnergyInducedDecay(long energy) {
         if (energeticDecayInstant < 0) return elementalDecays;
         return new cElementalDecay[]{elementalDecays[energeticDecayInstant]};
     }
 
     @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
     public cElementalDecay[] getDecayArray() {
         return elementalDecays;
     }
 
     @Override
-    public float getRawLifeTime() {
+    public float getRawTimeSpan() {
         return rawLifeTime;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java
index 3fc042f0d9..76e8f51033 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java
@@ -33,6 +33,8 @@ import static gregtech.api.enums.OrePrefixes.dust;
  * Created by danie_000 on 18.11.2016.
  */
 public final class dAtomDefinition extends cElementalDefinition {
+    public static final long ATOM_COMPLEXITY_LIMIT=65536L;
+
     private final int hash;
     public static final bTransformationInfo transformation=new bTransformationInfo(16,0,64);
     public static float refMass, refUnstableMass;
@@ -70,6 +72,8 @@ public final class dAtomDefinition extends cElementalDefinition {
     public final int neutralCount;
     public final int element;
 
+    public final boolean specialEnergeticDecayHandling;
+
     private final cElementalDefinitionStackMap elementalStacks;
 
     //stable is rawLifeTime>=10^9
@@ -108,7 +112,7 @@ public final class dAtomDefinition extends cElementalDefinition {
         boolean containsAnti = false;
         for (cElementalDefinitionStack stack : elementalStacks.values()) {
             iElementalDefinition def = stack.definition;
-            int amount = stack.amount;
+            int amount = (int)stack.amount;
             mass += stack.getMass();
             if (def.getType() < 0) containsAnti = true;
             type = Math.max(type, Math.abs(def.getType()));
@@ -131,7 +135,6 @@ public final class dAtomDefinition extends cElementalDefinition {
 
         element = Math.abs(element);
 
-
         //stability curve
         int StableIsotope = stableIzoCurve(element);
         int izoDiff = neutralCount - StableIsotope;
@@ -139,20 +142,22 @@ public final class dAtomDefinition extends cElementalDefinition {
 
         hash=super.hashCode();
 
-        iaea=iaeaNuclide.get(element,neutralCount);
+        xstr.setSeed((element + 1L) * (neutralCount + 100L));
+        this.iaea=iaeaNuclide.get(element,neutralCount);
         if(iaea!=null){
-            xstr.setSeed((long) (element + 1) * (neutralCount + 100));
             this.rawLifeTime=containsAnti ? iaea.Thalf * 1.5514433E-21f * (1f + xstr.nextFloat() * 9f):iaea.Thalf;
+            this.specialEnergeticDecayHandling=iaea.energeticStates!=null && iaea.energeticStates.size()>1;//todo fix since it also has base level
+            //todo add energetic decays?
         }else{
             Float overriddenLifeTime=lifetimeOverrides.get(this);
             float rawLifeTimeTemp;
             if(overriddenLifeTime!=null)
                 rawLifeTimeTemp = overriddenLifeTime;
             else {
-                xstr.setSeed((long) (element + 1) * (neutralCount + 100));
                 rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
             }
             this.rawLifeTime=rawLifeTimeTemp> STABLE_RAW_LIFE_TIME ? STABLE_RAW_LIFE_TIME :rawLifeTimeTemp;
+            this.specialEnergeticDecayHandling=false;
         }
 
 
@@ -227,12 +232,15 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
         boolean nuclei = false;
-        for (cElementalDefinitionStack stack : stacks.values())
+        long qty=0;
+        for (cElementalDefinitionStack stack : stacks.values()) {
             if (stack.definition instanceof dHadronDefinition) {
                 if (((dHadronDefinition) stack.definition).amount != 3) return false;
                 nuclei = true;
             } else if (!(stack.definition instanceof eLeptonDefinition)) return false;
-        return nuclei;
+            qty+=stack.amount;
+        }
+        return nuclei && qty<ATOM_COMPLEXITY_LIMIT;
     }
 
     @Override
@@ -263,11 +271,16 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     @Override
-    public float getRawLifeTime() {
+    public float getRawTimeSpan() {
         return rawLifeTime;
     }
 
     @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+
+    @Override
     public byte getColor() {
         return -10;
     }
@@ -323,16 +336,19 @@ public final class dAtomDefinition extends cElementalDefinition {
                 case 2:
                     return MbetaDecay();
                 case Byte.MAX_VALUE:
-                    return iaeaDecay();
-                default:
-                    return getNaturalDecayInstant();
+                    return iaeaDecay(0);
             }
-        } else {
-            return getNaturalDecayInstant();
         }
+        return getNaturalDecayInstant();
     }
 
-    private cElementalDecay[] iaeaDecay(){
+    private cElementalDecay[] iaeaDecay(long energy){
+        //todo
+        if(energy==0){
+
+        }else{
+
+        }
         return null;
     }
 
@@ -501,7 +517,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     @Override
-    public cElementalDecay[] getEnergeticDecayInstant() {
+    public cElementalDecay[] getEnergyInducedDecay(long energy) {
+        if (specialEnergeticDecayHandling) {
+            //todo map energetic states
+            return iaeaDecay(energy);
+        }
         //strip leptons
         boolean doIt = true;
         ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<cElementalDefinitionStack>();
@@ -529,6 +549,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return specialEnergeticDecayHandling;
+    }
+
+    @Override
     public cElementalDecay[] getNaturalDecayInstant() {
         //disembody
         ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<cElementalDefinitionStack>();
@@ -588,6 +613,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private final static class nomenclature {
+        private nomenclature(){}
         static final private String[] Symbol = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
         static final private String[] Name = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
         static final private String[] SymbolIUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java
index d473abcb6d..404020ba07 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java
@@ -106,13 +106,12 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     //public but u can just try{}catch(){} the constructor it still calls this method
     private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
-        int amount = 0;
+        long amount = 0;
         for (cElementalDefinitionStack quarks : stacks.values()) {
             if (!(quarks.definition instanceof eQuarkDefinition)) return false;
             amount += quarks.amount;
         }
-        if (amount < 2 || amount > 12) return false;
-        return true;
+        return amount >= 2 && amount <= 12;
     }
 
     @Override
@@ -164,11 +163,14 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     @Override
     public cElementalDecay[] getNaturalDecayInstant() {
+        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
+        if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType())
+            return cElementalDecay.noProduct;
         ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<>();
-        for (cElementalDefinitionStack quarkStack : quarkStacks.values()) {
-            if (quarkStack.definition.getType() == 1 || quarkStack.definition.getType() == -1) {
+        for (cElementalDefinitionStack quarks : quarkStacks) {
+            if (quarks.definition.getType() == 1 || quarks.definition.getType() == -1) {
                 //covers both quarks and antiquarks
-                decaysInto.add(quarkStack);
+                decaysInto.add(quarks);
             } else {
                 //covers both quarks and antiquarks
                 decaysInto.add(new cElementalDefinitionStack(boson_Y__, 2));
@@ -181,18 +183,23 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     }
 
     @Override
-    public cElementalDecay[] getEnergeticDecayInstant() {
+    public cElementalDecay[] getEnergyInducedDecay(long energy) {
         cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
         if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType())
-            return new cElementalDecay[]{eBosonDefinition.deadEnd};
+            return cElementalDecay.noProduct;
         return new cElementalDecay[]{new cElementalDecay(0.75F, quarkStacks), eBosonDefinition.deadEnd}; //decay into quarks
     }
 
     @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
     public cElementalDecay[] getDecayArray() {
         cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
         if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType())
-            return new cElementalDecay[]{eBosonDefinition.deadEnd};
+            return cElementalDecay.noProduct;
         else if (amount != 3)
             return new cElementalDecay[]{new cElementalDecay(0.95F, quarkStacks), eBosonDefinition.deadEnd}; //decay into quarks
         else {
@@ -221,9 +228,9 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
             try {
                 return new cElementalDecay[]{
-                        new cElementalDecay(0.98F, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
+                        new cElementalDecay(0.99F, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
                         new cElementalDecay(0.001F, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__),
-                        eBosonDefinition.deadEnd}; //decay into quarks
+                        eBosonDefinition.deadEnd};
             } catch (tElementalException e) {
                 if (DEBUG_MODE) e.printStackTrace();
                 return new cElementalDecay[]{eBosonDefinition.deadEnd};
@@ -242,11 +249,16 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     }
 
     @Override
-    public float getRawLifeTime() {
+    public float getRawTimeSpan() {
         return rawLifeTime;
     }
 
     @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+
+    @Override
     public byte getType() {
         return type;
     }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java
index d9cdf8db4e..1e3d23c9ef 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java
@@ -34,13 +34,13 @@ public final class iaeaNuclide {
             while((line=reader.readLine())!=null) {
                 String[] split= Util.splitButDifferent(line,",");
                 if(split.length!=19) throw new Error("Invalid count ("+split.length+") of separators in IAEA nuclides database " + line);
-                if(split[1].length()>0 && !blockOfData.isEmpty()) {
+                if(split[1].length()>0 && blockOfData.size()>0) {
                     new iaeaNuclide(blockOfData.toArray(new String[0][]));
                     blockOfData.clear();
                 }
                 blockOfData.add(split);
             }
-            if(!blockOfData.isEmpty()) {
+            if(blockOfData.size()>0) {
                 new iaeaNuclide(blockOfData.toArray(new String[0][]));
                 blockOfData.clear();
             }
@@ -78,6 +78,10 @@ public final class iaeaNuclide {
         for(String s:decays){
             System.out.println(s);
         }
+
+        for(iaeaNuclide nuclide:NUCLIDES.values()){
+            //todo fix decays
+        }
     }
 
     public static iaeaNuclide get(int protons, int neutrons){
@@ -108,25 +112,16 @@ public final class iaeaNuclide {
         }else{
             parts = Util.splitButDifferent(rows[0][4], "|");
             Thalf = (float)doubleOrNaN(parts[0],"half life");
-            //if(Thalf>STABLE_RAW_LIFE_TIME) System.out.println("KEK KEK"+N+" "+Z+" "+Thalf);
         }
-
-        for(int i=0;i<rows.length;i++){
-            add(rows[i][5]);
-        }
-
-
-        //for(String[] S:rows) {
-        //    for(String s:S)System.out.print(s+" ");
-        //    System.out.println();
-        //}
-        //System.out.println("KEKEKEK");
     }
 
     private void getMoreData(String[] cells){
-        add(cells[14]);
-        add(cells[17]);
-        add(cells[20]);
+        if(add(cells[14])); //System.out.println(Z+" "+N);
+        if(add(cells[17])); //System.out.println(Z+" "+N);
+        if(add(cells[20])); //System.out.println(Z+" "+N);
+        TreeMap<Float,String> decaymodes=new TreeMap<>();
+
+        new energeticState(this,Thalf,decaymodes);
     }
 
     private double doubleOrNaN(String s, String name){
@@ -162,13 +157,15 @@ public final class iaeaNuclide {
                 throw new Error("Missing nuclide "+(int)doubleOrNaN(cells[0],"protons")+" "+(int)doubleOrNaN(cells[1],"neutrons"));
             this.energy=(float) (doubleOrNaN(cells[3],"energy level",nuclide)*1000);//to eV
             this.Thalf=(float) doubleOrNaN(cells[10],"half life",nuclide);
-            if(nuclide.energeticStates==null)
-                nuclide.energeticStates=new TreeMap<>();
+            if(nuclide.energeticStates==null) {
+                new Exception("Should be initialized before doing this... "+ nuclide.N +" "+nuclide.Z).printStackTrace();
+                nuclide.energeticStates = new TreeMap<>();
+            }
             nuclide.energeticStates.put(energy,this);
 
-            add(cells[12]);
-            add(cells[15]);
-            add(cells[18]);
+            if(add(cells[12])); //System.out.println(nuclide.Z+" "+nuclide.N);
+            if(add(cells[15])); //System.out.println(nuclide.Z+" "+nuclide.N);
+            if(add(cells[18])); //System.out.println(nuclide.Z+" "+nuclide.N);
         }
 
         private double doubleOrNaN(String s, String name){
@@ -194,12 +191,14 @@ public final class iaeaNuclide {
     }
 
     private static HashSet<String> decays=new HashSet<>();
-    private static void add(String s){
+    private static boolean add(String s){
         int len=decays.size();
         decays.add(s);
         if(decays.size()>len){
             System.out.println(s);
+            return true;
         }
+        return false;
     }
     public enum decayType{
         ;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/cPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
index cef87b5a39..ee58c69b5a 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
@@ -32,4 +32,9 @@ public final class cPrimitiveDefinition extends cElementalPrimitive {
     public String getName() {
         return "Primitive: " + name;
     }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java
index d52d5505c1..62c1d2b9ab 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java
@@ -20,9 +20,8 @@ public final class eBosonDefinition extends cElementalPrimitive {
     }
 
     public static void run() {
-        boson_Y__.init(null, -1F, 0, 1,
-                new cElementalDecay(boson_Y__),
-                deadEnd);
+        boson_Y__.init(null, -1F, 0, 0,
+                deadEndHalf);
         boson_H__.init(null, 1.56e-22F, 0, 0,
                 new cElementalDecay(0.96F, new cElementalDefinitionStack(boson_Y__, 4)),
                 new cElementalDecay(0.02F, eLeptonDefinition.lepton_t, eLeptonDefinition.lepton_t_),
@@ -34,4 +33,9 @@ public final class eBosonDefinition extends cElementalPrimitive {
     public String getName() {
         return "Boson: " + name;
     }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eLeptonDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eLeptonDefinition.java
index 4d66a7cae2..8edb7ab503 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eLeptonDefinition.java
@@ -26,9 +26,7 @@ public final class eLeptonDefinition extends cElementalPrimitive {
     }
 
     public static void run() {
-        lepton_e.init(lepton_e_, 100000F, 2, 3,
-                new cElementalDecay(0.9F, lepton_e),
-                new cElementalDecay(0.05F, nothing),
+        lepton_e.init(lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
                 eBosonDefinition.deadEnd,//makes photons and don't care
                 new cElementalDecay(lepton_e, eBosonDefinition.boson_Y__));
         lepton_m.init(lepton_m_, 2.197019e-6F, 0, 1,
@@ -40,9 +38,7 @@ public final class eLeptonDefinition extends cElementalPrimitive {
                 new cElementalDecay(0.05F, lepton_m, eNeutrinoDefinition.lepton_Vm_, eNeutrinoDefinition.lepton_Vt, eBosonDefinition.boson_H__),
                 eBosonDefinition.deadEnd);//makes photons and don't care
 
-        lepton_e_.init(lepton_e, 100000F, 2, 3,
-                new cElementalDecay(0.9F, lepton_e_),
-                new cElementalDecay(0.05F, nothing),
+        lepton_e_.init(lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
                 eBosonDefinition.deadEnd,//makes photons and don't care
                 new cElementalDecay(lepton_e_, eBosonDefinition.boson_Y__));
         lepton_m_.init(lepton_m, 2.197e-6F, 0, 1,
@@ -59,4 +55,9 @@ public final class eLeptonDefinition extends cElementalPrimitive {
     public String getName() {
         return "Lepton: " + name;
     }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
index df9b081e9b..9abe584e8d 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
@@ -24,35 +24,32 @@ public final class eNeutrinoDefinition extends cElementalPrimitive {
     }
 
     public static void run() {
-        lepton_Ve.init(lepton_Ve_, 1F, 1, 0,
-                new cElementalDecay(0.95F, nothing),
-                new cElementalDecay(0.1F, lepton_Ve),
-                eBosonDefinition.deadEndHalf);
+        lepton_Ve.init(lepton_Ve_, 1F, 0, 0,
+                cElementalDecay.noProduct);
         lepton_Vm.init(lepton_Vm_, 1F, 1, 0,
-                new cElementalDecay(0.9F, nothing),
-                new cElementalDecay(0.1F, lepton_Vm),
+                new cElementalDecay(0.95F, nothing),
                 eBosonDefinition.deadEndHalf);
         lepton_Vt.init(lepton_Vt_, 1F, 1, 0,
-                new cElementalDecay(0.85F, nothing),
-                new cElementalDecay(0.1F, lepton_Vt),
-                eBosonDefinition.deadEndHalf);
+                new cElementalDecay(0.9F, nothing),
+                eBosonDefinition.deadEnd);
 
-        lepton_Ve_.init(lepton_Ve, 1F, 1, 0,
-                new cElementalDecay(0.95F, nothing),
-                new cElementalDecay(0.1F, lepton_Ve_),
-                eBosonDefinition.deadEndHalf);
+        lepton_Ve_.init(lepton_Ve, 1F, 0, 0,
+                cElementalDecay.noProduct);
         lepton_Vm_.init(lepton_Vm, 1F, 1, 0,
-                new cElementalDecay(0.9F, nothing),
-                new cElementalDecay(0.1F, lepton_Vm_),
+                new cElementalDecay(0.95F, nothing),
                 eBosonDefinition.deadEndHalf);
         lepton_Vt_.init(lepton_Vt, 1F, 1, 0,
-                new cElementalDecay(0.85F, nothing),
-                new cElementalDecay(0.1F, lepton_Vt_),
-                eBosonDefinition.deadEndHalf);
+                new cElementalDecay(0.9F, nothing),
+                eBosonDefinition.deadEnd);
     }
 
     @Override
     public String getName() {
         return "Lepton: " + name;
     }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eQuarkDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eQuarkDefinition.java
index a8662f7338..3ddb650f12 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eQuarkDefinition.java
@@ -95,4 +95,9 @@ public final class eQuarkDefinition extends cElementalPrimitive {
     public String getName() {
         return "Quark: " + name;
     }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 66929ad77a..a469872047 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -108,7 +108,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
             byte Tick = (byte) (aTick % 20);
             if (DECAY_AT == Tick) {
                 purgeOverflow();
-                content.tickContent(postEnergize);//Hatches don't life time mult things
+                content.tickContentByOneSecond(1,postEnergize);//Hatches don't life time mult things
                 purgeOverflow();
             } else if (OVERFLOW_AT == Tick) {
                 if (overflowMatter <= 0) {
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 04d2cea363..57900f37e4 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
@@ -127,7 +127,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         float mass = from.getMass();
         float euMult = mass / refMass;
         eAmpereFlow = (int) Math.ceil(euMult);
-        if (mass > refUnstableMass || from.getDefinition().getRawLifeTime() < 1.5e25f) {
+        if (mass > refUnstableMass || from.getDefinition().getRawTimeSpan() < 1.5e25f) {
             mEUt = (int) -V[10];
         } else {
             mEUt = (int) -V[8];
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 f245e63ff5..96d8e97361 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
@@ -153,7 +153,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         float mass = into.getMass();
         float euMult = mass / refMass;
         eAmpereFlow = (int) Math.ceil(euMult);
-        if (mass > refUnstableMass || into.getDefinition().getRawLifeTime() < 1.5e25f) {
+        if (mass > refUnstableMass || into.getDefinition().getRawTimeSpan() < 1.5e25f) {
             mEUt = (int) -V[10];
         } else {
             mEUt = (int) -V[8];
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
index e31626910a..6ee2e7f88f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
@@ -179,7 +179,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
     public boolean checkRecipe_EM(ItemStack itemStack) {
         tRecipe=null;
         aRecipe=null;
-        if(!eHolders.isEmpty() && eHolders.get(0).mInventory[0]!=null) {
+        if(eHolders.size()>0 && eHolders.get(0).mInventory[0]!=null) {
             holdItem = eHolders.get(0).mInventory[0].copy();
             if(ItemList.Tool_DataStick.isStackEqual(itemStack, false, true)) {
                 for (GT_Recipe.GT_Recipe_AssemblyLine assRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
@@ -265,7 +265,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public void outputAfterRecipe_EM() {
-        if(!eHolders.isEmpty()) {
+        if(eHolders.size()>0) {
             if (tRecipe != null && ItemList.Tool_DataStick.isStackEqual(mInventory[1], false, true)){
                 eHolders.get(0).getBaseMetaTileEntity().setActive(false);
                 eHolders.get(0).mInventory[0] = null;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 158293c38d..d43765f7f2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -174,7 +174,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         eRecipe=null;
-        if(!eInputHatches.isEmpty() && eInputHatches.get(0).getContainerHandler().hasStacks() && !eOutputHatches.isEmpty()) {
+        if(eInputHatches.size()>0 && eInputHatches.get(0).getContainerHandler().hasStacks() && !eOutputHatches.isEmpty()) {
             cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContainerHandler();
             if(ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) {
                 GT_Recipe scannerRecipe=null;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java
index 3fd05f9eb5..e28e12069e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -578,7 +578,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                             float remaining = voider.overflowMax - voider.getOverflowMatter();
                             for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
                                 for (cElementalInstanceStack instance : in.getContainerHandler().values()) {
-                                    int qty = (int) Math.floor(remaining / instance.definition.getMass());
+                                    long qty = (long) Math.floor(remaining / instance.definition.getMass());
                                     if (qty > 0) {
                                         qty = Math.min(qty, instance.amount);
                                         if (voider.addOverflowMatter(instance.definition.getMass() * qty))
@@ -589,7 +589,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                             }
                             for (GT_MetaTileEntity_Hatch_OutputElemental out : eOutputHatches) {
                                 for (cElementalInstanceStack instance : out.getContainerHandler().values()) {
-                                    int qty = (int) Math.floor(remaining / instance.definition.getMass());
+                                    long qty = (long)Math.floor(remaining / instance.definition.getMass());
                                     if (qty > 0) {
                                         qty = Math.min(qty, instance.amount);
                                         if (voider.addOverflowMatter(instance.definition.getMass() * qty))
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo
index e24b3ff4c9..b255c2013c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo
@@ -28,3 +28,9 @@ floodlightb
 fix eu/t checks if needs maintenance!!!
 
 make microwave grinder cap autosmelting based on power
+
+
+iterative halflife formula:
+
+=prev qty* 2^(-t diff / t half)
+