From 2d9bfa024c21fd69289dabefa810bab8a95ded50 Mon Sep 17 00:00:00 2001 From: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Date: Mon, 23 Jan 2023 22:08:16 +0200 Subject: fix ULV recipes being OCed too much (#1680) * fix ULV recipes being OCed too much * ULV is until 8 not 16 XD --- .../java/gregtech/api/util/GT_OverclockCalculator.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java index 8003e21054..71b6c8e37f 100644 --- a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java +++ b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java @@ -220,12 +220,19 @@ public class GT_OverclockCalculator { } } - while ((mRecipeEUt * mParallel * mRecipeAmps) << mEUtIncrasePerOC < mEUt * mAmps) { - if (mDuration <= 1) { - break; + int tRecipeTier = GT_Utility.getTier(mRecipeEUt); + if (tRecipeTier == 0) { + int tTier = GT_Utility.getTier(mEUt); + mRecipeEUt = (mRecipeEUt * (1L << tTier - 1) * (1L << tTier - 1)); + mDuration = (mDuration / (1 << tTier - 1)); + } else { + while ((mRecipeEUt * mParallel * mRecipeAmps) << mEUtIncrasePerOC < mEUt * mAmps) { + if (mDuration <= 1) { + break; + } + mRecipeEUt <<= mEUtIncrasePerOC; + mDuration >>= mDurationDecreasePerOC; } - mRecipeEUt <<= mEUtIncrasePerOC; - mDuration >>= mDurationDecreasePerOC; } if (mDuration < 1) { -- cgit