Import pollution mixins from hodgepodge (#3395)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

87 files changed, 946 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;
 
 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) {
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
index 79da529aeb..22a9f7b220 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
@@ -36,11 +36,11 @@ import gregtech.api.items.MetaBaseItem;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GTLanguageManager;
 import gregtech.api.util.GTOreDictUnificator;
-import gregtech.common.Pollution;
 import gregtech.common.UndergroundOil;
 import gregtech.common.blocks.BlockOresAbstract;
 import gregtech.common.blocks.TileEntityOres;
 import gregtech.common.items.behaviors.BehaviourNone;
+import gregtech.common.pollution.Pollution;
 
 /**
  * Created by wital_000 on 19.03.2016.
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
index e9364f922b..3d6a33fe7f 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
@@ -14,7 +14,7 @@ import gregtech.api.enums.GTValues;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder;