From f9d58f56364cd84e017fb4633c97ea0098669c35 Mon Sep 17 00:00:00 2001
From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:17:58 +0100
Subject: Fix compact fusion tierskip, wrong OC and scanner info (#238)

* negate scanner eu/t

* prevent fusion tierskips

* stop compacts from overclocking on-tier recipes

* undo star import
---
 .../blocks/tileEntity/base/LargeFusionComputer.java          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/main/java/goodgenerator')

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
index af41493ba3..4ad851f958 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
@@ -5,6 +5,7 @@ import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
 import static gregtech.api.util.GT_StructureUtility.ofFrame;
 import static gregtech.api.util.GT_Utility.filterValidMTEs;
+import static gregtech.api.util.GT_Utility.roundUpVoltage;
 
 import java.util.List;
 
@@ -449,13 +450,18 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
             @NotNull
             @Override
             protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
-                return super.createOverclockCalculator(recipe).limitOverclockCount(overclock(recipe.mSpecialValue));
+                int overclockCount = overclock(recipe.mSpecialValue);
+                if (GT_Values.VP[LargeFusionComputer.this.tier()] <= roundUpVoltage(recipe.mEUt)) {
+                    overclockCount = 0;
+                }
+                return super.createOverclockCalculator(recipe).limitOverclockCount(overclockCount);
             }
 
             @NotNull
             @Override
             protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
-                if (!mRunningOnLoad && recipe.mSpecialValue > maxEUStore()) {
+                if (!mRunningOnLoad && recipe.mSpecialValue > maxEUStore()
+                        || GT_Values.VP[LargeFusionComputer.this.tier()] < recipe.mEUt) {
                     return CheckRecipeResultRegistry.insufficientStartupPower(recipe.mSpecialValue);
                 }
                 maxParallel = getMaxPara() * extraPara(recipe.mSpecialValue);
@@ -588,7 +594,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
                         + EnumChatFormatting.RESET,
                 StatCollector.translateToLocal("GT5U.fusion.req") + ": "
                         + EnumChatFormatting.RED
-                        + GT_Utility.formatNumbers(lEUt)
+                        + GT_Utility.formatNumbers(-lEUt)
                         + EnumChatFormatting.RESET
                         + "EU/t",
                 StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
-- 
cgit