diff options
author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2024-02-22 20:17:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-22 20:17:58 +0100 |
commit | f9d58f56364cd84e017fb4633c97ea0098669c35 (patch) | |
tree | 34a4f2460299a3713a2a887691a4ab382bd3ff9d /src/main/java/goodgenerator | |
parent | 642c762cd3866e728145cbb1a212965607b4108d (diff) | |
download | GT5-Unofficial-f9d58f56364cd84e017fb4633c97ea0098669c35.tar.gz GT5-Unofficial-f9d58f56364cd84e017fb4633c97ea0098669c35.tar.bz2 GT5-Unofficial-f9d58f56364cd84e017fb4633c97ea0098669c35.zip |
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
Diffstat (limited to 'src/main/java/goodgenerator')
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | 12 |
1 files changed, 9 insertions, 3 deletions
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") + ": " |