diff options
| author | BlueWeabo <ilia.iliev2005@gmail.com> | 2023-07-24 11:43:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-24 11:43:51 +0300 |
| commit | 0d66f68954187f58125ca35fc7c8feba656afbc2 (patch) | |
| tree | 2349955404362cef32a5fd78f9ee119cc5f3f6ac /src | |
| parent | 75633e41387b6ef37dc02b7e0cc5076936c9b3ed (diff) | |
| download | GT5-Unofficial-0d66f68954187f58125ca35fc7c8feba656afbc2.tar.gz GT5-Unofficial-0d66f68954187f58125ca35fc7c8feba656afbc2.tar.bz2 GT5-Unofficial-0d66f68954187f58125ca35fc7c8feba656afbc2.zip | |
Fix EBF calculating twice and Oil Cracker having wrong discount (#2172)
* fix
* address reviews
* spotless
Diffstat (limited to 'src')
2 files changed, 3 insertions, 20 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index f2f6ffd45a..d7c34af6d0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -197,14 +197,10 @@ public class GT_MetaTileEntity_ElectricBlastFurnace extends @Override protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe, @Nonnull GT_ParallelHelper helper) { - return new GT_OverclockCalculator().setRecipeEUt(recipe.mEUt) - .setDuration(recipe.mDuration) - .setEUt(availableVoltage) - .setRecipeHeat(recipe.mSpecialValue) + return super.createOverclockCalculator(recipe, helper).setRecipeHeat(recipe.mSpecialValue) .setMultiHeat(mHeatingCapacity) .enableHeatOC() - .enableHeatDiscount() - .calculate(); + .enableHeatDiscount(); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index e531108e1a..256c6d79e5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -14,8 +14,6 @@ import static gregtech.api.util.GT_StructureUtility.ofCoil; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -38,8 +36,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Multi import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_ParallelHelper; import gregtech.api.util.GT_Recipe; public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_OilCracker> @@ -173,16 +169,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult @Override protected ProcessingLogic createProcessingLogic() { - return new ProcessingLogic() { - - @Nonnull - @Override - protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe, - @Nonnull GT_ParallelHelper helper) { - return super.createOverclockCalculator(recipe, helper) - .setEUtDiscount(Math.max((0.1F * (heatLevel.getTier() + 1.0F)), 0.5F)); - } - }; + return new ProcessingLogic().setEuModifier(1.0F - Math.min(0.1F * (heatLevel.getTier() + 1), 0.5F)); } @Override |