small change to essetia fuel value

3 files changed, 22 insertions, 16 deletions

diff --git a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
index 0e36d78b0c..376ea8bfc6 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
@@ -37,7 +37,7 @@ import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable {
 
     private IStructureDefinition<LargeEssentiaGenerator> multiDefinition = null;
-    protected final int ENERGY_PER_ESSENTIA_DEFAULT = 512;
+    protected final int ENERGY_PER_ESSENTIA_DEFAULT = 8192;
     protected int mStableValue = 0;
     protected long mLeftEnergy;
     protected ArrayList<EssentiaHatch> mEssentiaHatch = new ArrayList<>();
@@ -244,16 +244,16 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM
     }
 
     public long getPerAspectEnergy(Aspect aspect) {
-        if (aspect.equals(Aspect.ENERGY)) return 4500 * mStableValue / 25;
-        if (aspect.equals(Aspect.FIRE)) return 3000 * mStableValue / 25;
-        if (aspect.equals(Aspect.GREED)) return 13000 * mStableValue / 25;
-        if (aspect.equals(Aspect.AURA)) return 9000 * mStableValue / 25;
-        if (aspect.equals(Aspect.TREE)) return 2200 * mStableValue / 25;
-        if (aspect.equals(Aspect.AIR)) return 1300 * mStableValue / 25;
-        if (aspect.equals(Aspect.MAGIC)) return 5200 * mStableValue / 25;
-        if (aspect.equals(Aspect.MECHANISM)) return 4000 * mStableValue / 25;
-        if (aspect.equals(TC_Aspects.ELECTRUM.mAspect)) return 32768 * mStableValue / 25;
-        if (aspect.equals(TC_Aspects.RADIO.mAspect)) return 131072 * mStableValue / 25;
+        if (aspect.equals(Aspect.ENERGY)) return 45000 * mStableValue / 25;
+        if (aspect.equals(Aspect.FIRE)) return 30000 * mStableValue / 25;
+        if (aspect.equals(Aspect.GREED)) return 130000 * mStableValue / 25;
+        if (aspect.equals(Aspect.AURA)) return 120000 * mStableValue / 25;
+        if (aspect.equals(Aspect.TREE)) return 25000 * mStableValue / 25;
+        if (aspect.equals(Aspect.AIR)) return 13000 * mStableValue / 25;
+        if (aspect.equals(Aspect.MAGIC)) return 92000 * mStableValue / 25;
+        if (aspect.equals(Aspect.MECHANISM)) return 40000 * mStableValue / 25;
+        if (aspect.equals(TC_Aspects.ELECTRUM.mAspect)) return 131072 * mStableValue / 25;
+        if (aspect.equals(TC_Aspects.RADIO.mAspect)) return 524288 * mStableValue / 25;
 
         return ENERGY_PER_ESSENTIA_DEFAULT * mStableValue / 25;
     }
@@ -272,6 +272,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM
                         aspects.remove(aspect);
                 }
             }
+            if (EUt == 0 && aspects.size() != 0) {
+                EUt += getPerAspectEnergy(aspects.getAspects()[0]);
+                aspects.reduce(aspects.getAspects()[0], 1);
+                if (aspects.getAmount(aspects.getAspects()[0]) == 0)
+                    aspects.remove(aspects.getAspects()[0]);
+            }
         }
 
         if (EUt <= voltageLimit) {
@@ -280,7 +286,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM
             mLeftEnergy = 0;
         }
         else {
-            while (EUVoltage * (EUAmp + 1) <= EUt) {
+            while (EUVoltage * (EUAmp + 1) <= EUt && EUAmp + 1 <= ampLimit) {
                 EUAmp ++;
             }
             mLeftEnergy = EUt - (EUVoltage * EUAmp);
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index eff9b3543f..05165be943 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -187,6 +187,6 @@ achievement.FRF_Coil_3.0.desc=Pickup this item to see the recipe in NEI
 
 #Thaumcraft Research Context
 research.ESSENTIA_GENERATOR.page.0=You have found that Essentia contains much more power than you thought. Is there a way to generate electricity from these Essentia?
-research.ESSENTIA_GENERATOR.page.1=Different Essentia contains different amount of energy.<BR><BR>Potentia: 4500EU<BR><BR>Ignis: 3000EU<BR><BR>Lucrum: 13000EU<BR><BR>Auram: 9000EU<BR><BR>Arbor: 2200EU<BR><BR>Aer: 1300EU<BR><BR>Praecantatio: 5200EU<BR><BR>Machina: 4000EU<BR><BR>Electrum: 32768EU<BR><BR>Radio: 131072EU
-research.ESSENTIA_GENERATOR.page.2=The unlisted Aspects contain 512EU per Essentia.
+research.ESSENTIA_GENERATOR.page.1=Different Essentia contains different amount of energy.<BR><BR>Potentia: 45000EU<BR><BR>Ignis: 30000EU<BR><BR>Lucrum: 130000EU<BR><BR>Auram: 120000EU<BR><BR>Arbor: 25000EU<BR><BR>Aer: 13000EU<BR><BR>Praecantatio: 92000EU<BR><BR>Machina: 40000EU<BR><BR>Electrum: 131072EU<BR><BR>Radio: 524288EU
+research.ESSENTIA_GENERATOR.page.2=The unlisted Aspects contain 8192EU per Essentia.
 research.ESSENTIA_CELL.page.0=The Novice Cell has such low efficiency that you can't bear it. So you discovered a new way to make some better Cells<BR><BR>The Novice Cell only provides 1 StablePoint, the Adept one provides 2 StablePoint, and the Master one provides 5 StablePoint!<BR><BR>With higher StablePoint, the generator can create more electricity from pre Essential.
\ No newline at end of file
diff --git a/src/main/resources/assets/goodgenerator/lang/zh_CN.lang b/src/main/resources/assets/goodgenerator/lang/zh_CN.lang
index 9e59aa2f5c..01bfe8162c 100644
--- a/src/main/resources/assets/goodgenerator/lang/zh_CN.lang
+++ b/src/main/resources/assets/goodgenerator/lang/zh_CN.lang
@@ -153,6 +153,6 @@ achievement.FRF_Coil_3.0=终极力场约束线圈
 achievement.FRF_Coil_3.0.desc=捡起这个物品以在NEI内查看配方
 
 research.ESSENTIA_GENERATOR.page.0=你发现源质内蕴含的能量超乎你的想象.有没有用这些源质发电的方法呢?
-research.ESSENTIA_GENERATOR.page.1=不同的源质蕴含不等的能量.<BR><BR>Potentia: 4500EU<BR><BR>Ignis: 3000EU<BR><BR>Lucrum: 13000EU<BR><BR>Auram: 9000EU<BR><BR>Arbor: 2200EU<BR><BR>Aer: 1300EU<BR><BR>Praecantatio: 5200EU<BR><BR>Machina: 4000EU<BR><BR>Electrum: 32768EU<BR><BR>Radio: 131072EU
-research.ESSENTIA_GENERATOR.page.2=未列出的源质,每点均含有512EU.
+research.ESSENTIA_GENERATOR.page.1=不同的源质蕴含不等的能量.<BR><BR>Potentia: 45000EU<BR><BR>Ignis: 30000EU<BR><BR>Lucrum: 130000EU<BR><BR>Auram: 120000EU<BR><BR>Arbor: 25000EU<BR><BR>Aer: 13000EU<BR><BR>Praecantatio: 92000EU<BR><BR>Machina: 40000EU<BR><BR>Electrum: 131072EU<BR><BR>Radio: 524288EU
+research.ESSENTIA_GENERATOR.page.2=未列出的源质,每点均含有8192EU.
 research.ESSENTIA_CELL.page.0=新手源质扩散单元的效率实在太低,你完全不能忍受. 所以你研发了一些新的源质扩散单元<BR><BR>新手源质扩散单元只提供1稳定点,学徒级的单元可以提供2稳定点,而大师级的单元可以提供足足5稳定点!<BR><BR>随着稳定点越高,每点源质在发电机中产生的能量就越多.