diff options
| author | BlueWeabo <ilia.iliev2005@gmail.com> | 2023-08-03 21:56:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-03 20:56:49 +0200 |
| commit | 182dac2499b8528b423ff4c68e3a5b33e817b79e (patch) | |
| tree | be5488191f10a7ea23f2308d2378cfd96271fe13 /src/main | |
| parent | 5c4a3ce0960fefc05952c05d73f10c31b504da29 (diff) | |
| download | GT5-Unofficial-182dac2499b8528b423ff4c68e3a5b33e817b79e.tar.gz GT5-Unofficial-182dac2499b8528b423ff4c68e3a5b33e817b79e.tar.bz2 GT5-Unofficial-182dac2499b8528b423ff4c68e3a5b33e817b79e.zip | |
Fix compacts mk4 and mk5 having way too many overclocks (#191)
* fix compacts mk4 and mk5 having way too many overclocks
* fix wrong tier overclocks allowing mk4 to overclock mk4 recipes
* fix having 1/8th the power
* use super
Diffstat (limited to 'src/main')
3 files changed, 9 insertions, 17 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java index fc42fa9733..b25d5851d1 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java @@ -137,12 +137,7 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public int tierOverclock() { - return 64; - } - - @Override - public int overclock(int mStartEnergy) { - return (mStartEnergy < 160000000) ? 64 : ((mStartEnergy < 320000000) ? 16 : (mStartEnergy < 640000000) ? 4 : 1); + return 8; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java index 692227686b..21ea21f59e 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java @@ -137,14 +137,7 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public int tierOverclock() { - return 256; - } - - @Override - public int overclock(int mStartEnergy) { - return (mStartEnergy < 160000000) ? 256 - : ((mStartEnergy < 320000000) ? 64 - : ((mStartEnergy < 640000000) ? 16 : ((mStartEnergy < 1200000000) ? 4 : 1))); + return 16; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java index 1225fda96f..9583d30198 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java @@ -1,8 +1,5 @@ package goodgenerator.blocks.tileEntity.base; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.Textures.BlockIcons.*; - import gregtech.api.logic.ProcessingLogic; public abstract class LargeFusionComputerPP extends LargeFusionComputer { @@ -19,4 +16,11 @@ public abstract class LargeFusionComputerPP extends LargeFusionComputer { protected ProcessingLogic createProcessingLogic() { return super.createProcessingLogic().setOverclock(2, 2); } + + @Override + protected long getSingleHatchPower() { + // Multiply by 8 so that we can have the original input power per hatch + return super.getSingleHatchPower() * 8; + } + } |