diff options
author | Alexdoru <57050655+Alexdoru@users.noreply.github.com> | 2024-10-21 21:21:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-21 19:21:33 +0000 |
commit | 901cb0d294b0c4f114bb247fbd7d6f97e7484f3c (patch) | |
tree | fd4900d59f98ec34c9119c2003f79f7467abddf0 /src/main/java/bartworks/common/tileentities | |
parent | e741976ea6a6fa5dbcb45813fd1e2ca368331ba5 (diff) | |
download | GT5-Unofficial-901cb0d294b0c4f114bb247fbd7d6f97e7484f3c.tar.gz GT5-Unofficial-901cb0d294b0c4f114bb247fbd7d6f97e7484f3c.tar.bz2 GT5-Unofficial-901cb0d294b0c4f114bb247fbd7d6f97e7484f3c.zip |
Import pollution mixins from hodgepodge (#3395)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/bartworks/common/tileentities')
-rw-r--r-- | src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java | 8 | ||||
-rw-r--r-- | src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java b/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java index 046ecb40f2..88afbd821c 100644 --- a/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java +++ b/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java @@ -49,7 +49,8 @@ import bartworks.API.modularUI.BWUITextures; import bartworks.MainMod; import bartworks.common.configs.Configuration; import gregtech.api.util.GTUtility; -import gregtech.common.Pollution; +import gregtech.common.pollution.Pollution; +import gregtech.common.pollution.PollutionConfig; public class TileEntityHeatedWaterPump extends TileEntity implements ITileDropsContent, IFluidHandler, IFluidTank, ITileWithModularUI, ITileAddsInformation, ITileHasDifferentTextureSides { @@ -167,8 +168,7 @@ public class TileEntityHeatedWaterPump extends TileEntity implements ITileDropsC .ifPresent(e -> { if (e.getTotalWorldTime() % 20 == 0) { Optional.ofNullable(e.getChunkFromBlockCoords(this.xCoord, this.zCoord)) - .ifPresent( - c -> Pollution.addPollution(c, Configuration.pollution.pollutionHeatedWaterPumpSecond)); + .ifPresent(c -> Pollution.addPollution(c, PollutionConfig.pollutionHeatedWaterPumpSecond)); } }); } @@ -334,7 +334,7 @@ public class TileEntityHeatedWaterPump extends TileEntity implements ITileDropsC + GTUtility.formatNumbers(Configuration.singleBlocks.mbWaterperSec) + String.format( StatCollector.translateToLocal("tooltip.tile.waterpump.1.name"), - Configuration.pollution.pollutionHeatedWaterPumpSecond), + PollutionConfig.pollutionHeatedWaterPumpSecond), StatCollector.translateToLocal("tooltip.tile.waterpump.2.name") }; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java index 7a5e361c8d..9fb028d51c 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -71,6 +71,7 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; +import gregtech.common.pollution.PollutionConfig; public class MTEMegaBlastFurnace extends MegaMultiBlockBase<MTEMegaBlastFurnace> implements ISurvivalConstructable { @@ -151,7 +152,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase<MTEMegaBlastFurnace> Materials.CarbonMonoxide.getGas(1000), Materials.SulfurDioxide.getGas(1000) }; private int mHeatingCapacity; private byte glassTier; - private final static int polPtick = Configuration.pollution.basePollutionMBFSecond / 20 + private final static int polPtick = PollutionConfig.basePollutionMBFSecond / 20 * Configuration.Multiblocks.megaMachinesMax; public MTEMegaBlastFurnace(int aID, String aName, String aNameRegional) { |