From d930635ec63d91daada5cbaaabc07e1f09b56474 Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Tue, 5 Dec 2023 15:18:07 +0800 Subject: [PATCH] fix --- .../tileEntity/base/LargeFusionComputer.java | 41 ++++++------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index ef850237..da6f96da 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -271,39 +271,26 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { } if (mStartUpCheck < 0) { if (mMachine) { + long mStoredEUt = aBaseMetaTileEntity.getStoredEU(); + long energyToMove = getSingleHatchPower(); if (this.mEnergyHatches != null) { 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), - 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 (aBaseMetaTileEntity.getStoredEU() + energyToMove < maxEUStore() + && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(energyToMove, false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits(energyToMove, true); + } } } if (this.eEnergyMulti != null) { 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() + energyToMove < maxEUStore() + && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(energyToMove, false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits(energyToMove, true); + } } } - if (aBaseMetaTileEntity.getStoredEU() <= 0 && mMaxProgresstime > 0) { - stopMachine(); + if (mStoredEUt <= 0 && mMaxProgresstime > 0) { + criticalStopMachine(); } if (mMaxProgresstime > 0) { this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(-lEUt, true); @@ -582,9 +569,7 @@ public String[] getInfoData() { default -> EnumChatFormatting.GOLD + "V" + EnumChatFormatting.RESET; }; float plasmaOut = 0; - int powerRequired = 0; if (this.mLastRecipe != null) { - powerRequired = this.mLastRecipe.mEUt * this.para * overclock(this.mLastRecipe.mSpecialValue); if (this.mLastRecipe.getFluidOutput(0) != null) { plasmaOut = (float) this.mLastRecipe.getFluidOutput(0).amount / (float) this.mLastRecipe.mDuration * this.para; @@ -598,7 +583,7 @@ public String[] getInfoData() { + EnumChatFormatting.RESET, StatCollector.translateToLocal("GT5U.fusion.req") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(powerRequired) + + GT_Utility.formatNumbers(-lEUt) + EnumChatFormatting.RESET + "EU/t", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "