Push some collider work and change plasma nerf behaviour.

14 files changed, 613 insertions, 164 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 989968c170..6f1c4fc7a0 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -76,7 +76,7 @@ public class TecTech {
         hasCOFH = Loader.isModLoaded(Reference.COFHCORE);
 
         MainLoader.load();
-        MainLoader.addAfterPostLoad();
+        MainLoader.addAfterGregTechPostLoadRunner();
     }
 
     @Mod.EventHandler
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
index 433a3a2697..95671f2515 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
@@ -110,6 +110,10 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
 
     @Override
     public NBTTagCompound toNBT() {
+        return getNbtTagCompound(nbtType, aspectStacks);
+    }
+
+    public static NBTTagCompound getNbtTagCompound(byte nbtType, cElementalDefinitionStackMap aspectStacks) {
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setByte("t", nbtType);
         cElementalDefinitionStack[] quarkStacksValues = aspectStacks.values();
@@ -248,6 +252,10 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
         return -96;
     }
 
+    public static byte getClassTypeStatic(){
+        return -96;
+    }
+
     @Override
     public int hashCode() {
         return hash;
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 48c297c5f9..04b354f737 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -244,14 +244,14 @@ public final class MainLoader {
         //todo add GC GS stuff
     }
 
-    public static void addAfterPostLoad() {
+    public static void addAfterGregTechPostLoadRunner() {
         GregTech_API.sAfterGTPostload.add(new Runnable() {
             @Override
             public void run() {
                 if(TecTech.configTecTech.NERF_FUSION) {
                     FixBrokenFusionRecipes();
                 }
-                GT_MetaTileEntity_EM_collider.heliumPlasmaValue = getFuelValue(Materials.Helium.getPlasma(125));
+                GT_MetaTileEntity_EM_collider.setValues(getFuelValue(Materials.Helium.getPlasma(125)));
             }
         });
     }
@@ -290,7 +290,21 @@ public final class MainLoader {
                 if (DEBUG_MODE) {
                     LOGGER.info("Nerfing Recipe " + r.mFluidOutputs[0].getUnlocalizedName());
                 }
-                r.mFluidOutputs[0] = new FluidStack(fluid, r.mFluidInputs[0].amount);
+                r.mFluidOutputs[0] = new FluidStack(fluid, r.mFluidOutputs[0].amount);
+            }
+            fluid = binds.get(r.mFluidInputs[0].getFluid());
+            if (fluid != null) {
+                if (DEBUG_MODE) {
+                    LOGGER.info("Fixing plasma use in Recipe " + r.mFluidInputs[0].getUnlocalizedName());
+                }
+                r.mFluidInputs[0] = new FluidStack(fluid, r.mFluidInputs[0].amount);
+            }
+            fluid = binds.get(r.mFluidInputs[1].getFluid());
+            if (fluid != null) {
+                if (DEBUG_MODE) {
+                    LOGGER.info("Fixing plasma use in Recipe " + r.mFluidInputs[1].getUnlocalizedName());
+                }
+                r.mFluidInputs[1] = new FluidStack(fluid, r.mFluidInputs[1].amount);
             }
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
index 799b1f183f..bfbe93bb4f 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
@@ -313,7 +313,7 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
 
     public cElementalInstanceStack get(int i){
         Collection<cElementalInstanceStack> var = map.values();
-        return var.toArray(new cElementalInstanceStack[var.size()])[i];
+        return var.toArray(new cElementalInstanceStack[0])[i];
     }
 
     public String[] getElementalInfo() {
@@ -339,12 +339,12 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
 
     public cElementalInstanceStack[] values() {
         Collection<cElementalInstanceStack> var = map.values();
-        return var.toArray(new cElementalInstanceStack[var.size()]);
+        return var.toArray(new cElementalInstanceStack[0]);
     }
 
     public iElementalDefinition[] keys() {
         Set<iElementalDefinition> var = map.keySet();
-        return var.toArray(new iElementalDefinition[var.size()]);
+        return var.toArray(new iElementalDefinition[0]);
     }
 
     public float getMass() {
@@ -406,7 +406,6 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
                 removeAmount(false,instance);
                 for (cElementalInstanceStack newInstance : newInstances.values()) {
                     putUnify(newInstance);
-                    newInstance.nextColor();
                 }
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
index 172067f93b..829af20ca6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
@@ -53,7 +53,7 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa
     public cElementalDefinitionStackMap toImmutable() {
         return new cElementalDefinitionStackMap(map);
     }
-    public cElementalDefinitionStackMap toImmutable_unsafeMightLeaveExposedElementalTree() {
+    public cElementalDefinitionStackMap toImmutable_optimized_unsafeLeavesExposedElementalTree() {
         return new cElementalDefinitionStackMap(this);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
index b0ee3f8460..d97ec5d1f6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
@@ -154,6 +154,22 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return lifeTimeMult;
     }
 
+    public cElementalInstanceStackMap tickStackByOneSecond(float lifeTimeMult, int postEnergize){
+        return tickStack(lifeTimeMult,postEnergize,1);
+    }
+
+    public cElementalInstanceStackMap tickStack(float lifeTimeMult, int postEnergize, int seconds){
+        cElementalInstanceStackMap newInstances = decay(lifeTimeMult, age += seconds, postEnergize);
+        if (newInstances == null) {
+            nextColor();
+        } else {
+            for (cElementalInstanceStack newInstance : newInstances.values()) {
+                newInstance.nextColor();
+            }
+        }
+        return newInstances;
+    }
+
     public cElementalInstanceStackMap decay() {
         return decay(1F, age, 0);//try to decay without changes
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
index 5d0826ffb6..5db86a0349 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
@@ -201,6 +201,10 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
         return -128;
     }
 
+    public static byte getClassTypeStatic(){
+        return -128;
+    }
+
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
index 01e5571f23..367b412201 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
@@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.HashMap;
+import java.util.HashSet;
 
 /**
  * Created by Tec on 26.05.2017.
@@ -24,11 +25,7 @@ public class bTransformationInfo {
     public static final HashMap<Integer,aOredictQuantizationInfo> oredictQuantization=new HashMap<>(32);
     public HashMap<iElementalDefinition,aOredictDequantizationInfo> oredictDequantization;
 
-    public bTransformationInfo(){
-        fluidDequantization=new HashMap<>();
-        itemDequantization=new HashMap<>();
-        oredictDequantization=new HashMap<>();
-    }
+    public static final HashSet<iElementalDefinition> stacksRegistered=new HashSet<>();
 
     public bTransformationInfo(int fluidCap,int itemCap, int oreCap){
         if(fluidCap>0) {
@@ -45,49 +42,58 @@ public class bTransformationInfo {
     public void addFluid(iHasElementalDefinition em, FluidStack fluidStack){
         fluidQuantization.put(fluidStack.getFluidID(),new aFluidQuantizationInfo(fluidStack,em));
         fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluidStack));
+        stacksRegistered.add(em.getDefinition());
     }
 
     public void addFluid(iHasElementalDefinition em ,int fluidID,int fluidAmount) {
         fluidQuantization.put(fluidID,new aFluidQuantizationInfo(fluidID,fluidAmount,em));
         fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluidID,fluidAmount));
+        stacksRegistered.add(em.getDefinition());
     }
 
     public void addFluid(iHasElementalDefinition em, Fluid fluid, int fluidAmount){
         fluidQuantization.put(fluid.getID(),new aFluidQuantizationInfo(fluid,fluidAmount,em));
         fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluid,fluidAmount));
+        stacksRegistered.add(em.getDefinition());
     }
 
-    public void addItemQuantization(aItemQuantizationInfo aIQI){
+    private void addItemQuantization(aItemQuantizationInfo aIQI){
         itemQuantization.put(aIQI,aIQI);
     }
 
     public void addItem(iHasElementalDefinition em, ItemStack itemStack, boolean skipNBT){
         addItemQuantization(new aItemQuantizationInfo(itemStack,skipNBT,em));
         itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,itemStack));
+        stacksRegistered.add(em.getDefinition());
     }
 
     public void addItem(iHasElementalDefinition em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
         addItemQuantization(new aItemQuantizationInfo(prefix,material,amount,skipNBT,em));
         itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,prefix,material,amount));
+        stacksRegistered.add(em.getDefinition());
     }
 
     public void addOredict(iHasElementalDefinition em, int id, int qty){
         oredictQuantization.put(id,new aOredictQuantizationInfo(id,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,id,qty));
+        stacksRegistered.add(em.getDefinition());
     }
 
     public void addOredict(iHasElementalDefinition em, String name, int qty){
         oredictQuantization.put(OreDictionary.getOreID(name),new aOredictQuantizationInfo(name,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,name,qty));
+        stacksRegistered.add(em.getDefinition());
     }
 
     public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, Materials material, int qty){
         oredictQuantization.put(OreDictionary.getOreID(prefix.name() + material.mName),new aOredictQuantizationInfo(prefix,material,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,material,qty));
+        stacksRegistered.add(em.getDefinition());
     }
 
     public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, String materialName, int qty){
         oredictQuantization.put(OreDictionary.getOreID(prefix.name() + materialName),new aOredictQuantizationInfo(prefix,materialName,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,materialName,qty));
+        stacksRegistered.add(em.getDefinition());
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java
index 16a668dfe3..5f191a4274 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java
@@ -27,6 +27,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import java.util.*;
 
 import static com.github.technus.tectech.XSTR.XSTR_INSTANCE;
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition.getNbtTagCompound;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.deadEnd;
@@ -462,28 +463,28 @@ public final class dAtomDefinition extends cElementalDefinition {
             case "D": {
                 if (withThis.removeAllAmounts(false, deuterium.definition.getSubParticles())){
                     withThis.putReplace(deuterium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "3H": {
                 if (withThis.removeAllAmounts(false, tritium.definition.getSubParticles())){
                     withThis.putReplace(tritium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "3HE": {
                 if (withThis.removeAllAmounts(false, helium_3.definition.getSubParticles())){
                     withThis.putReplace(helium_3);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "8BE": {
                 if (withThis.removeAllAmounts(false, beryllium_8.definition.getSubParticles())){
                     withThis.putReplace(beryllium_8);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                     return true;
                 }
             } break;
@@ -491,8 +492,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, carbon_14.definition.getSubParticles())){
                     newStuff.putReplace(carbon_14);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -505,8 +506,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, neon_24.definition.getSubParticles())){
                     newStuff.putReplace(neon_24);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -519,8 +520,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, silicon_34.definition.getSubParticles())){
                     newStuff.putReplace(silicon_34);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -533,8 +534,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2,dHadronDefinition.hadron_p2)){
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -549,8 +550,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -565,8 +566,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -581,8 +582,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -597,8 +598,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -612,8 +613,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     withThis.putUnify(dHadronDefinition.hadron_n1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -627,8 +628,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     withThis.putUnify(dHadronDefinition.hadron_n2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -643,8 +644,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -659,8 +660,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -676,8 +677,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -693,8 +694,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -709,8 +710,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -726,8 +727,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_n1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -743,8 +744,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_n2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -759,8 +760,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -774,8 +775,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -790,8 +791,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));