fix compact fusion energy consumption (#222)

* fix

* correct tooltip

* correct mk4 tooltip

* fix

3 files changed, 18 insertions, 37 deletions

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
index 7930beb0fd..a3924acf04 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
@@ -50,7 +50,7 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP {
                 .addInfo("Make sure the whole structure is built in the 3x3")
                 .addInfo("chunk area of the ring center (not controller).").addInfo("Performs 4/4 overclock.")
                 .addInfo("Startup < 160,000,000 EU: 256x Parallel").addInfo("Startup < 320,000,000 EU: 192x Parallel")
-                .addInfo("Startup < 640,000,000 EU: 128x Parallel").addInfo("Startup < 1,200,000,000 EU: 64x Parallel")
+                .addInfo("Startup < 640,000,000 EU: 128x Parallel").addInfo("Startup >= 640,000,000 EU: 64x Parallel")
                 .addInfo(
                         "Support" + EnumChatFormatting.BLUE
                                 + " Tec"
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
index 8ab7a83b30..4b12f4bc6a 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
@@ -51,7 +51,7 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP {
                 .addInfo("chunk area of the ring center (not controller).").addInfo("Performs 4/4 overclock.")
                 .addInfo("Startup < 160,000,000 EU: 320x Parallel").addInfo("Startup < 320,000,000 EU: 256x Parallel")
                 .addInfo("Startup < 640,000,000 EU: 192x Parallel").addInfo("Startup < 1,200,000,000 EU: 128x Parallel")
-                .addInfo("Startup < 2,000,000,000 EU: 64x Parallel")
+                .addInfo("Startup >= 1,200,000,000 EU: 64x Parallel")
                 .addInfo(
                         "Support" + EnumChatFormatting.BLUE
                                 + " Tec"
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
index ef85023706..8fe09d5442 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
@@ -271,39 +271,26 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
             }
             if (mStartUpCheck < 0) {
                 if (mMachine) {
+                    long mStoredEUt = aBaseMetaTileEntity.getStoredEU();
+                    long energyToMove = getSingleHatchPower();
                     if (this.mEnergyHatches != null) {
                         for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
-                            if (aBaseMetaTileEntity.getStoredEU()
-                                    + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore()
-                                    && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(
-                                            2048L * tierOverclock() * getMaxPara() * extraPara(100),
-                                            false)) {
-                                aBaseMetaTileEntity.increaseStoredEnergyUnits(
-                                        2048L * tierOverclock() * getMaxPara() * extraPara(100),
-                                        true);
-                            } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore()
-                                    && tHatch.getBaseMetaTileEntity()
-                                            .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) {
-                                                aBaseMetaTileEntity
-                                                        .increaseStoredEnergyUnits(2048L * tierOverclock(), true);
-                                            }
+                            if (aBaseMetaTileEntity.getStoredEU() + energyToMove < maxEUStore()
+                                    && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(energyToMove, false)) {
+                                aBaseMetaTileEntity.increaseStoredEnergyUnits(energyToMove, true);
+                            }
                         }
                     }
                     if (this.eEnergyMulti != null) {
                         for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) {
-                            if (aBaseMetaTileEntity.getStoredEU() + getSingleHatchPower() < maxEUStore() && tHatch
-                                    .getBaseMetaTileEntity().decreaseStoredEnergyUnits(getSingleHatchPower(), false)) {
-                                aBaseMetaTileEntity.increaseStoredEnergyUnits(getSingleHatchPower(), true);
-                            } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore()
-                                    && tHatch.getBaseMetaTileEntity()
-                                            .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) {
-                                                aBaseMetaTileEntity
-                                                        .increaseStoredEnergyUnits(2048L * tierOverclock(), true);
-                                            }
+                            if (aBaseMetaTileEntity.getStoredEU() + energyToMove < maxEUStore()
+                                    && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(energyToMove, false)) {
+                                aBaseMetaTileEntity.increaseStoredEnergyUnits(energyToMove, true);
+                            }
                         }
                     }
-                    if (aBaseMetaTileEntity.getStoredEU() <= 0 && mMaxProgresstime > 0) {
-                        stopMachine();
+                    if (mStoredEUt <= 0 && mMaxProgresstime > 0) {
+                        criticalStopMachine();
                     }
                     if (mMaxProgresstime > 0) {
                         this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(-lEUt, true);
@@ -316,6 +303,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
                                     0,
                                     Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1])));
                             mOutputItems = null;
+                            mOutputFluids = null;
                             mProgresstime = 0;
                             mMaxProgresstime = 0;
                             mEfficiencyIncrease = 0;
@@ -581,15 +569,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
             case 9 -> EnumChatFormatting.RED + "IV" + EnumChatFormatting.RESET;
             default -> EnumChatFormatting.GOLD + "V" + EnumChatFormatting.RESET;
         };
-        float plasmaOut = 0;
-        int powerRequired = 0;
-        if (this.mLastRecipe != null) {
-            powerRequired = this.mLastRecipe.mEUt * this.para * overclock(this.mLastRecipe.mSpecialValue);
-            if (this.mLastRecipe.getFluidOutput(0) != null) {
-                plasmaOut = (float) this.mLastRecipe.getFluidOutput(0).amount / (float) this.mLastRecipe.mDuration
-                        * this.para;
-            }
-        }
+        double plasmaOut = 0;
+        if (mMaxProgresstime > 0) plasmaOut = (double) mOutputFluids[0].amount / mMaxProgresstime;
 
         return new String[] { EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier,
                 StatCollector.translateToLocal("scanner.info.UX.0") + ": "
@@ -598,7 +579,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
                         + EnumChatFormatting.RESET,
                 StatCollector.translateToLocal("GT5U.fusion.req") + ": "
                         + EnumChatFormatting.RED
-                        + GT_Utility.formatNumbers(powerRequired)
+                        + GT_Utility.formatNumbers(-lEUt)
                         + EnumChatFormatting.RESET
                         + "EU/t",
                 StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "