rebal decay

3 files changed, 14 insertions, 14 deletions

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index a520cdd657..95884ad25e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -37,7 +37,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
     private static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10;
-    private static final double MASS_TO_EU=ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear")*800000.0/ URANIUM_INGOT_MASS_DIFF;//*20
+    private static final double MASS_TO_EU= ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear") * 3000000.0 / URANIUM_INGOT_MASS_DIFF;//*20
     private static final double MASS_TO_EU_INSTANT= MASS_TO_EU*20;
 
     //region structure
@@ -154,11 +154,10 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
 
         outputEM[0].tickContent(1,0,1);
-
-        mEUt=(int)((mass-outputEM[0].getMass())*MASS_TO_EU);
-        mEUt/=getParameterInInt(0,0);
+        double energyDose=((mass-outputEM[0].getMass())*MASS_TO_EU);
+        mEUt=(int)(energyDose/getParameterInInt(0,0));
         eAmpereFlow=getParameterInInt(0,0);
-
+        
         //todo move not actually decaying crap, beware of energy using decays?
 
         //for(cElementalInstanceStack stack:contents.values()){
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 cf36547524..552ec48055 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
@@ -135,12 +135,12 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         float mass = from.getMass();
-        float euMult = mass / refMass;
-        eAmpereFlow = (int) Math.ceil(euMult);
+        float euMult = Math.abs(mass / refMass);
+        eAmpereFlow = (int) Math.ceil(Math.sqrt(Math.sqrt(euMult)));
         if (mass > refUnstableMass || from.getDefinition().getRawTimeSpan(energy) < STABLE_RAW_LIFE_TIME) {
-            mEUt = (int) -V[10];
-        } else {
             mEUt = (int) -V[8];
+        } else {
+            mEUt = (int) -V[6];
         }
     }
 
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 7f1c553840..cc4492f2aa 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
@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import static com.github.technus.tectech.Util.*;
 import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition.DEFAULT_ENERGY_LEVEL;
+import static com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.elementalMatter.definitions.complex.atom.dAtomDefinition.refMass;
 import static com.github.technus.tectech.elementalMatter.definitions.complex.atom.dAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
@@ -172,12 +173,12 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         float mass = into.getMass();
-        float euMult = mass / refMass;
-        eAmpereFlow = (int) Math.ceil(euMult);
-        if (mass > refUnstableMass || into.getDefinition().getRawTimeSpan(DEFAULT_ENERGY_LEVEL) < 1.5e25f) {
-            mEUt = (int) -V[10];
-        } else {
+        float euMult = Math.abs(mass / refMass);
+        eAmpereFlow = (int) Math.ceil(Math.sqrt(Math.sqrt(euMult)));
+        if (mass > refUnstableMass || into.getDefinition().getRawTimeSpan(DEFAULT_ENERGY_LEVEL) < STABLE_RAW_LIFE_TIME) {
             mEUt = (int) -V[8];
+        } else {
+            mEUt = (int) -V[6];
         }
         outputEM = new cElementalInstanceStackMap[]{
                 into instanceof cElementalInstanceStack ?