Implement cleanup

3 files changed, 8 insertions, 4 deletions

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 9544d8d7e5..ae76f5dc1c 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
@@ -552,7 +552,7 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
 
     public void cleanUp(){
         for(Map.Entry<iElementalDefinition, cElementalInstanceStack> entry:map.entrySet()){
-            if(entry.getValue().amount<=0) {
+            if(entry.getValue().amount<1) {
                 map.remove(entry.getKey());
             }
         }
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 bf84663058..69247d9e1a 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
@@ -81,6 +81,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         aNBT.setInteger("postEnergize", postEnergize);
         //aNBT.setFloat("lifeTimeMult",lifeTimeMult);
         aNBT.setDouble("OverflowMatter", overflowMatter);
+        content.cleanUp();
         aNBT.setTag("eM_Stacks", content.toNBT());
         aNBT.setShort("eID", id);
     }
@@ -109,8 +110,10 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         if (aBaseMetaTileEntity.isServerSide()) {
             byte Tick = (byte) (aTick % 20);
             if (DECAY_AT == Tick) {
+                content.cleanUp();
                 purgeOverflow();
                 content.tickContentByOneSecond(1, postEnergize);//Hatches don't life time mult things
+                content.cleanUp();
                 purgeOverflow();
             } else if (OVERFLOW_AT == Tick) {
                 if (overflowMatter <= 0) {
@@ -151,6 +154,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
                 }
             } else if (MOVE_AT == Tick) {
                 if (content.hasStacks()) {
+                    content.cleanUp();
                     moveAround(aBaseMetaTileEntity);
                 }
                 getBaseMetaTileEntity().setActive(content.hasStacks());
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
index b81dd885a5..c86c06b2a0 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
@@ -11,10 +11,10 @@ import static com.github.technus.tectech.util.CommonValues.V;
  */
 public class Behaviour_Recycler implements GT_MetaTileEntity_EM_machine.IBehaviour {
     private final int tier;
-    private final float coeff;
+    private final double coeff;
     public Behaviour_Recycler(int tier){
         this.tier=tier;
-        coeff=(float)(1/Math.pow(2,tier-4));
+        coeff=(1D/Math.pow(2D,tier-4));
     }
 
     @Override
@@ -27,7 +27,7 @@ public class Behaviour_Recycler implements GT_MetaTileEntity_EM_machine.IBehavio
 
     @Override
     public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
-        float mass=0;
+        double mass=0;
         for (cElementalInstanceStackMap input : inputs) {
             if (input != null) {
                 mass += input.getMass();