diff options
| author | Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> | 2022-11-22 17:07:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-22 10:07:35 +0100 |
| commit | f7482a536ad7f75d42b1f3089cb1ad882baa261e (patch) | |
| tree | 3e30acbf4fb3208fb7d6865876129e894b1c32fd /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 35ef004e284c7413c34e7d473dfd8a6e924fcab4 (diff) | |
| download | GT5-Unofficial-f7482a536ad7f75d42b1f3089cb1ad882baa261e.tar.gz GT5-Unofficial-f7482a536ad7f75d42b1f3089cb1ad882baa261e.tar.bz2 GT5-Unofficial-f7482a536ad7f75d42b1f3089cb1ad882baa261e.zip | |
use long for overclock para (#1522)
* use long for overclock para
* keep old methods
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
2 files changed, 13 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java index 6d22622797..0d0d46ba7e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java @@ -35,7 +35,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase< @Override protected void calculateOverclockedNessMultiInternal( - int aEUt, int aDuration, int mAmperage, long maxInputVoltage, boolean perfectOC) { + long aEUt, int aDuration, int mAmperage, long maxInputVoltage, boolean perfectOC) { // 5% space for cable loss long zMaxInputVoltage = maxInputVoltage / 100L * 95L; long zTime = aDuration; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 9cd60153cf..bf0ccd5001 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -721,7 +721,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { * @param perfectOC - If the Multiblock OCs perfectly, i.e. the large Chemical Reactor */ protected void calculateOverclockedNessMultiInternal( - int aEUt, int aDuration, int mAmperage, long maxInputVoltage, boolean perfectOC) { + long aEUt, int aDuration, int mAmperage, long maxInputVoltage, boolean perfectOC) { byte mTier = (byte) Math.max(0, GT_Utility.getTier(maxInputVoltage)); if (mTier == 0) { // Long time calculation @@ -731,7 +731,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { mEUt = Integer.MAX_VALUE - 1; mMaxProgresstime = Integer.MAX_VALUE - 1; } else { - mEUt = aEUt >> 2; + mEUt = GT_Utility.safeInt(aEUt >> 2); mMaxProgresstime = (int) xMaxProgresstime; } } else { @@ -768,14 +768,24 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { } } + @Deprecated protected void calculateOverclockedNessMulti(int aEUt, int aDuration, int mAmperage, long maxInputVoltage) { calculateOverclockedNessMultiInternal(aEUt, aDuration, mAmperage, maxInputVoltage, false); } + protected void calculateOverclockedNessMulti(long aEUt, int aDuration, int mAmperage, long maxInputVoltage) { + calculateOverclockedNessMultiInternal(aEUt, aDuration, mAmperage, maxInputVoltage, false); + } + + @Deprecated protected void calculatePerfectOverclockedNessMulti(int aEUt, int aDuration, int mAmperage, long maxInputVoltage) { calculateOverclockedNessMultiInternal(aEUt, aDuration, mAmperage, maxInputVoltage, true); } + protected void calculatePerfectOverclockedNessMulti(long aEUt, int aDuration, int mAmperage, long maxInputVoltage) { + calculateOverclockedNessMultiInternal(aEUt, aDuration, mAmperage, maxInputVoltage, true); + } + public boolean drainEnergyInput(long aEU) { if (aEU <= 0) return true; for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) |