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 | |
| 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')
99 files changed, 1454 insertions, 657 deletions
diff --git a/src/main/java/bartworks/common/configs/Configuration.java b/src/main/java/bartworks/common/configs/Configuration.java index 50d144dc32..5ac693b92c 100644 --- a/src/main/java/bartworks/common/configs/Configuration.java +++ b/src/main/java/bartworks/common/configs/Configuration.java @@ -19,8 +19,6 @@ public class Configuration { public static final SingleBlocks singleBlocks = new SingleBlocks(); - public static final Pollution pollution = new Pollution(); - public static final RossRuinMetas rossRuinMetas = new RossRuinMetas(); @Config.Comment("Mixins section.") @@ -106,18 +104,6 @@ public class Configuration { public int mbWaterperSec; } - @Config.Comment("Pollution section.") - public static class Pollution { - - @Config.Comment("How much should the Simple Stirling Water Pump produce pollution per second") - @Config.DefaultInt(5) - public int pollutionHeatedWaterPumpSecond; - - @Config.Comment("How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel") - @Config.DefaultInt(400) - public int basePollutionMBFSecond; - } - @Config.Comment("Ross' ruins machine metaIDs section.") public static class RossRuinMetas { 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; |