this should do

6 files changed, 31 insertions, 16 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 01ac9077f3..76ab9c340c 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -101,9 +101,6 @@ public class TecTech {
         };
 
         GTCustomLoader.registerThingsInTabs();
-
-        if (Loader.isModLoaded("dreamcraft")) ;//TODO init recipes for GTNH version
-        else ;//TODO init recipes for NON-GTNH version
     }
 
     @EventHandler
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
index 70c869c8ea..b2c8108f19 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
@@ -48,7 +48,7 @@ public final class dAtomDefinition extends cElementalDefinition {//TODO Optimize
     public final int isotope;
     public final int element;
 
-    private final cElementalDefinitionStackMap elementalStacks;//CLONED I/O
+    private final cElementalDefinitionStackMap elementalStacks;
 
     //stable is rawLifeTime>=10^9
 
@@ -57,29 +57,29 @@ public final class dAtomDefinition extends cElementalDefinition {//TODO Optimize
 
     @Deprecated
     public dAtomDefinition(iElementalDefinition... things) throws tElementalException {
-        this(false, true, stackUpMap(things).toImmutable());
+        this(true, stackUpMap(things).toImmutable());
     }
 
     @Deprecated
     private dAtomDefinition(boolean check, iElementalDefinition... things) throws tElementalException {
-        this(false, check, stackUpMap(things).toImmutable());
+        this(check, stackUpMap(things).toImmutable());
     }
 
     public dAtomDefinition(cElementalDefinitionStack... things) throws tElementalException {
-        this(false, true, stackUpMap(things).toImmutable());
+        this(true, stackUpMap(things).toImmutable());
     }
 
     private dAtomDefinition(boolean check, cElementalDefinitionStack... things) throws tElementalException {
-        this(false, check, stackUpMap(things).toImmutable());
+        this(check, stackUpMap(things).toImmutable());
     }
 
     public dAtomDefinition(cElementalDefinitionStackMap things) throws tElementalException {
-        this(false, true, things);
+        this(true, things);
     }
 
-    private dAtomDefinition(boolean clone, boolean check, cElementalDefinitionStackMap things) throws tElementalException {
+    private dAtomDefinition(boolean check, cElementalDefinitionStackMap things) throws tElementalException {
         if (check && !canTheyBeTogether(things)) throw new tElementalException("Atom Definition error");
-        this.elementalStacks = clone ? things.clone() : things;
+        this.elementalStacks = things;
 
         float mass = 0;
         int cLeptons = 0;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
index 723d71d6ea..20f66be4c6 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
@@ -27,6 +27,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     public static cElementalDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2;
     private static float protonMass = 0F;
     private static float neutronMass = 0F;
+
     //float-mass in eV/c^2
     public final float mass;
     //int -electric charge in 1/3rds of electron charge for optimization
@@ -37,6 +38,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     public final byte type;
     //private final FluidStack fluidThing;
     //private final ItemStack itemThing;
+
     private final cElementalDefinitionStackMap quarkStacks;
 
     @Deprecated
diff --git a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
index f806e12d29..891d6ae338 100644
--- a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
@@ -12,7 +12,7 @@ import static com.github.technus.tectech.thing.CustomItemList.*;
  * Created by danie_000 on 16.11.2016.
  */
 public class MachineLoader implements Runnable {
-    public void run() {//TODO add config for starting position
+    public void run() {
         // ===================================================================================================
         // eM IN
         // ===================================================================================================
diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
index 7362706fae..0512c8def8 100644
--- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
@@ -9,6 +9,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_E
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_research;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM;
+import cpw.mods.fml.common.Loader;
 
 /**
  * Created by danie_000 on 16.11.2016.
@@ -16,7 +17,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_M
 public class RecipeLoader implements Runnable {
     public void run() {
         // ===================================================================================================
-        // def init
+        // Definition init
         // ===================================================================================================
 
         cElementalPrimitive.run();
@@ -37,7 +38,7 @@ public class RecipeLoader implements Runnable {
         dComplexAspectDefinition.run();
 
         // ===================================================================================================
-        // Recipe init
+        // MetaTE init
         // ===================================================================================================
 
         GT_MetaTileEntity_MultiblockBase_EM.run();
@@ -45,5 +46,22 @@ public class RecipeLoader implements Runnable {
         GT_MetaTileEntity_EM_computer.run();
         GT_MetaTileEntity_EM_research.run();
         GT_MetaTileEntity_EM_quantizer.run();
+
+        // ===================================================================================================
+        // Recipes init - common goes here rest goes into methods below
+        // ===================================================================================================
+
+
+
+        if (Loader.isModLoaded("dreamcraft")) runDreamRun();//TODO init recipes for GTNH version
+        else runBloodRun();//TODO init recipes for NON-GTNH version
+    }
+
+    private void runDreamRun(){
+
+    }
+
+    private void runBloodRun(){
+        //Don't init things after UV!!! They don't conform to the standards.
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Rack.java
index 0d891c1296..87bedcb3dd 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Rack.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Rack.java
@@ -61,8 +61,6 @@ public class GT_Container_Rack extends GT_ContainerMetaTile_Machine {
                 this.heat = par2 != 0;
                 return;
         }
-        //TODO TEST!!!
-        //if(heat || mActive!=0) Minecraft.getMinecraft().displayGuiScreen(null);
     }
 
     @Override