diff options
| author | Technus <daniel112092@gmail.com> | 2016-09-08 23:31:15 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-09-21 22:22:12 +0200 |
| commit | 9847f73d980c9a8c9cdacf95283e6d896406a8b7 (patch) | |
| tree | 4de3f7edbb2dc4fd5d5376980b5d3af9847d6c93 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 93da2917edd7dbe424f087c18d2b2fbab05100da (diff) | |
| download | GT5-Unofficial-9847f73d980c9a8c9cdacf95283e6d896406a8b7.tar.gz GT5-Unofficial-9847f73d980c9a8c9cdacf95283e6d896406a8b7.tar.bz2 GT5-Unofficial-9847f73d980c9a8c9cdacf95283e6d896406a8b7.zip | |
Work on tiers
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 60d491a495..6a2928a259 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -542,9 +542,9 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B while (tempEUt <= V[mTier -1] * (long)mAmperage) { tempEUt *= 4;//this actually controls overclocking - xEUt *= 4;//this is effect of everclocking + //xEUt *= 4;//this is effect of everclocking mMaxProgresstime /= 2;//this is effect of overclocking - xEUt = mMaxProgresstime==0 ? xEUt/2 : xEUt;//U know, if the time is less than 1 tick make the machine use 2x less power + xEUt = mMaxProgresstime==0 ? (long)(xEUt/1.1D) : xEUt*4;//U know, if the time is less than 1 tick make the machine use 2x less power } if(xEUt>Integer.MAX_VALUE-1){ mEUt = Integer.MAX_VALUE-1; 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 630044d4b2..21be2afa79 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 @@ -541,9 +541,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { while (tempEUt <= V[mTier -1] * mAmperage) { tempEUt *= 4;//this actually controls overclocking - xEUt *= 4;//this is effect of everclocking + //xEUt *= 4;//this is effect of everclocking mMaxProgresstime /= 2;//this is effect of overclocking - xEUt = mMaxProgresstime==0 ? xEUt/2 : xEUt;//U know, if the time is less than 1 tick make the machine use 2x less power + xEUt = mMaxProgresstime==0 ? (long)(xEUt/1.1D) : xEUt*4;//U know, if the time is less than 1 tick make the machine use less power } if(xEUt>Integer.MAX_VALUE-1){ mEUt = Integer.MAX_VALUE-1; |