bump ver

8 files changed, 57 insertions, 38 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 84f2ddf58b..f4dd1c826a 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -158,7 +158,6 @@ public class TecTech {
                 "dreamcraft",
                 "miscutils",
                 "GT++DarkWorld",
-                "TwilightForest",
                 "GalacticraftCore",
                 "GalacticraftMars",
                 "GalaxySpace",
@@ -179,8 +178,8 @@ public class TecTech {
                 "thaumicenergistics",
                 "witchery",
                 "lootgames",
-                Reference.MODID,
-                "utilityworlds"
+                "utilityworlds",
+                Reference.MODID
         ));
         String modId;
         for(Block block : GameData.getBlockRegistry().typeSafeIterable()) {
@@ -193,9 +192,25 @@ public class TecTech {
                     if ("grave".equals(GameRegistry.findUniqueIdentifierFor(block).name)) {
                         continue;
                     }
+                } else if ("TwilightForest".equals(modId)){
+                    if ("tile.TFShield".equals(GameRegistry.findUniqueIdentifierFor(block).name)){
+                        block.setResistance(40);
+                        continue;
+                    }else if ("tile.TFThorns".equals(GameRegistry.findUniqueIdentifierFor(block).name)){
+                        block.setResistance(10);
+                        continue;
+                    }else if ("tile.TFTowerTranslucent".equals(GameRegistry.findUniqueIdentifierFor(block).name)){
+                        block.setResistance(30);
+                        continue;
+                    }else if ("tile.TFDeadrock".equals(GameRegistry.findUniqueIdentifierFor(block).name)) {
+                        block.setResistance(5);
+                        continue;
+                    } else {
+                        continue;
+                    }
                 }
             }
-            block.setResistance(6);
+            block.setResistance(5);
         }
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java
index f8a52cf6a3..0575c2b8a5 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java
@@ -98,14 +98,12 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         setLifeTimeMultiplier(getLifeTimeMultiplier());
     }
 
-    @Deprecated //can be done from definition
     public float getEnergySettingCost(long currentEnergyLevel, long newEnergyLevel){
-        return definition.getEnergyDiffBetweenStates(currentEnergyLevel,newEnergyLevel);
+        return definition.getEnergyDiffBetweenStates(currentEnergyLevel,newEnergyLevel)*amount;
     }
 
-    @Deprecated //can be done from definition
     public float getEnergySettingCost(long newEnergyLevel){
-        return definition.getEnergyDiffBetweenStates(energy,newEnergyLevel);
+        return definition.getEnergyDiffBetweenStates(energy,newEnergyLevel)*amount;
     }
 
     public cElementalDefinitionStack getDefinitionStack() {
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java
index 8a0bd486c0..8692203e55 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java
@@ -17,7 +17,7 @@ public abstract class iElementalDefinition implements Comparable<iElementalDefin
     public static final float STABLE_RAW_LIFE_TIME =1.5e36f;
     public static final float NO_DECAY_RAW_LIFE_TIME=-1;
     public static final long DEFAULT_ENERGY_LEVEL=0;
-    public static final float DEFAULT_ENERGY_REQUIREMENT=25000f;
+    public static final float DEFAULT_ENERGY_REQUIREMENT=25000;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
 
     //Nomenclature
     public abstract String getName();
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index 5f69cbbc6d..64925e2a4b 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -13,7 +13,7 @@ import gregtech.common.GT_RecipeAdder;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-public class TT_recipeAdder extends GT_RecipeAdder {
+public class  TT_recipeAdder extends GT_RecipeAdder {
     public static final ItemStack[] nullItem=new ItemStack[0];
     public static final FluidStack[] nullFluid=new FluidStack[0];
 
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 208c890cd4..a520cdd657 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
@@ -35,10 +35,10 @@ import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBloc
 public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
-    private cElementalInstanceStackMap contents=new cElementalInstanceStackMap();
 
     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")*800000.0/ URANIUM_INGOT_MASS_DIFF;//*20
+    private static final double MASS_TO_EU_INSTANT= MASS_TO_EU*20;
 
     //region structure
     private static final String[][] shape = new String[][]{
@@ -126,44 +126,38 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
                 i.getContainerHandler().clear();
             }
             return startRecipe(map);
-        }else if(eSafeVoid){
-            contents.clear();
-            mEUt=0;
-        }else if(contents.hasStacks()){
-            return startRecipe(null);
         }
         return false;
     }
 
-    @Override
-    protected void afterRecipeCheckFailed() {
-        super.afterRecipeCheckFailed();
-    }
-
     private boolean startRecipe(cElementalInstanceStackMap input) {
-        if(input!=null) {
-            contents.putUnifyAll(input);
-        }
-
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
+        outputEM=new cElementalInstanceStackMap[2];
+        outputEM[0]=input;
+        outputEM[1]=new cElementalInstanceStackMap();
 
-        float mass=contents.getMass();
+        float mass=outputEM[0].getMass();
 
-        System.out.println("INPUT");
-        for(cElementalInstanceStack stack:contents.values()){
+        for(cElementalInstanceStack stack:outputEM[0].values()){
             if(stack.getEnergy()==0 && stack.definition.decayMakesEnergy(1)){
-                stack.setEnergy(1);
+                if(getBaseMetaTileEntity().decreaseStoredEnergyUnits((long)(stack.getEnergySettingCost(1)*MASS_TO_EU_INSTANT),false)){
+                    stack.setEnergy(1);
+                }else{
+                    outputEM[1].putReplace(stack);
+                }
+            }else if(stack.definition.decayMakesEnergy(stack.getEnergy())){
+
             }
             //System.out.println(stack.definition.getSymbol()+" "+stack.amount);
         }
 
 
-        contents.tickContent(1,0,1);
+        outputEM[0].tickContent(1,0,1);
 
-        mEUt=(int)((mass-contents.getMass())*MASS_TO_EU);
-        System.out.println("EUt = " +mEUt);
-        if(mEUt<0) mEUt=0;
+        mEUt=(int)((mass-outputEM[0].getMass())*MASS_TO_EU);
+        mEUt/=getParameterInInt(0,0);
+        eAmpereFlow=getParameterInInt(0,0);
 
         //todo move not actually decaying crap, beware of energy using decays?
 
@@ -210,4 +204,9 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
                 "Computation: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET,
         };
     }
+
+    @Override
+    public long maxEUStore() {
+        return super.maxEUStore();
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 6dfc35b1a5..a539de6ad7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -1613,7 +1613,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                                     }
                                 }
                             }
-                            if (ePowerPass) {
+                            if (ePowerPass && getEUVar()>getMinimumStoredEU()) {
                                 for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) {
                                     if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
                                         euVar = tHatch.maxEUOutput();
@@ -1819,6 +1819,12 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         return false;
     }
 
+    /**
+     *
+     * @param EU
+     * @param Amperes
+     * @return if was able to put inside the hatches
+     */
     private boolean addEnergyOutput_EM(long EU, long Amperes) {
         if(EU<0) {
             EU = -EU;
@@ -1862,6 +1868,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                 }
             }
         }
+        setEUVar(Math.min(getEUVar() + euVar,maxEUStore()));
         return false;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
index db60b2df39..bf557fa4f7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
@@ -191,7 +191,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
         @SideOnly(Side.CLIENT)
         void loadResources();
         @SideOnly(Side.CLIENT)
-        void initRecipe(ItemStack itemStack);
+        void initRender(ItemStack itemStack);
         @SideOnly(Side.CLIENT)
         void renderTooltips(ItemStack itemStack,int mouseX,int mouseY,GT_GUIContainer_DataReader gui);
         @SideOnly(Side.CLIENT)
@@ -218,7 +218,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
             }
 
             @Override
-            public void initRecipe(ItemStack itemStack) {
+            public void initRender(ItemStack itemStack) {
                 slots=new HashMap<>();
                 slots2=new HashMap<>();
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java
index 1b9c2f384c..97e7601b67 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java
@@ -119,7 +119,7 @@ public class GT_GUIContainer_DataReader extends GT_GUIContainerMetaTile_Machine
             for (GT_MetaTileEntity_DataReader.DataRender render : renders) {
                 if (render.canRender(thing, mTier)) {
                     if (!GT_Utility.areStacksEqual(stack, thing, false)) {
-                        render.initRecipe(thing);
+                        render.initRender(thing);
                     }
                     render.renderBackgroundOverlay(thing, mouseX, mouseY, x, y, this);
                     break;