diff options
| author | miozune <miozune@gmail.com> | 2023-10-31 00:18:26 +0900 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2023-10-30 19:26:11 +0100 |
| commit | 08b19f56cfa022b4161f27e16de1b8e9e6e6caad (patch) | |
| tree | a627dde095e53ac5986c7458d58106640074d05b /src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | |
| parent | 31f8e0d2c62ad607673809a110ee60020d4955d7 (diff) | |
| download | GT5-Unofficial-08b19f56cfa022b4161f27e16de1b8e9e6e6caad.tar.gz GT5-Unofficial-08b19f56cfa022b4161f27e16de1b8e9e6e6caad.tar.bz2 GT5-Unofficial-08b19f56cfa022b4161f27e16de1b8e9e6e6caad.zip | |
Cleanup isValidMetaTileEntity
Diffstat (limited to 'src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java')
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index a10fe5bfc6..1e542f857d 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -3,6 +3,7 @@ package goodgenerator.blocks.tileEntity.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GT_Utility.filterValidMTEs; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; @@ -263,38 +264,35 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (mStartUpCheck < 0) { if (mMachine) { if (this.mEnergyHatches != null) { - for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) - if (isValidMetaTileEntity(tHatch)) { - if (aBaseMetaTileEntity.getStoredEU() - + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore() - && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), - false)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits( + for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) { + if (aBaseMetaTileEntity.getStoredEU() + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore() + && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits( 2048L * tierOverclock() * getMaxPara() * extraPara(100), - true); - } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() - && tHatch.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { - aBaseMetaTileEntity - .increaseStoredEnergyUnits(2048L * tierOverclock(), true); - } - } + false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + true); + } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { + aBaseMetaTileEntity + .increaseStoredEnergyUnits(2048L * tierOverclock(), true); + } + } } if (this.eEnergyMulti != null) { - for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti) - if (isValidMetaTileEntity(tHatch)) { - if (aBaseMetaTileEntity.getStoredEU() + getSingleHatchPower() < maxEUStore() - && tHatch.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits(getSingleHatchPower(), false)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(getSingleHatchPower(), true); - } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() - && tHatch.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { - aBaseMetaTileEntity - .increaseStoredEnergyUnits(2048L * tierOverclock(), true); - } - } + for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) { + if (aBaseMetaTileEntity.getStoredEU() + getSingleHatchPower() < maxEUStore() && tHatch + .getBaseMetaTileEntity().decreaseStoredEnergyUnits(getSingleHatchPower(), false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits(getSingleHatchPower(), true); + } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { + aBaseMetaTileEntity + .increaseStoredEnergyUnits(2048L * tierOverclock(), true); + } + } } if (aBaseMetaTileEntity.getStoredEU() <= 0 && mMaxProgresstime > 0) { stopMachine(); |