Import pollution mixins from hodgepodge (#3395)

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

2 files changed, 15 insertions, 31 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java
index dd38f1ab26..5919a71b25 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java
@@ -20,10 +20,9 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 import gregtech.api.objects.GTRenderedTexture;
-import gregtech.common.Pollution;
+import gregtech.common.pollution.Pollution;
 import gtPlusPlus.core.item.general.ItemAirFilter;
 import gtPlusPlus.core.lib.GTPPCore;
-import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
@@ -31,21 +30,6 @@ public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGreg
 
     protected int SLOT_FILTER = 0;
 
-    @Override
-    public void onConfigLoad() {
-        super.onConfigLoad();
-        try {
-            int a1 = GTMod.gregtechproxy.mPollutionSmogLimit;
-            if (a1 > 0) {
-                mPollutionSmogLimit = a1;
-            }
-        } catch (Throwable t) {
-            mPollutionSmogLimit = 500000;
-        }
-    }
-
-    private int mPollutionSmogLimit = 500000;
-
     public MTEHatchMufflerAdvanced(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, new String[] { "" });
     }
@@ -271,8 +255,8 @@ public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGreg
         boolean chk1 = ran1 * 100.0F < (float) this.calculatePollutionReduction(100);
         boolean chk2;
         boolean chk3;
-        int aPollutionAmount = PollutionUtils.getPollution(getBaseMetaTileEntity());
-        if (aPollutionAmount >= mPollutionSmogLimit) {
+        int aPollutionAmount = Pollution.getPollution(getBaseMetaTileEntity());
+        if (aPollutionAmount >= GTMod.gregtechproxy.mPollutionSmogLimit) {
             ran2 = GTPPCore.RANDOM.nextFloat();
             ran3 = GTPPCore.RANDOM.nextFloat();
             chk2 = ran2 * 100.0F < (float) this.calculatePollutionReduction(100);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java
index 40678f203f..e7480e0f12 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java
@@ -21,10 +21,10 @@ import gregtech.api.metatileentity.implementations.MTEBasicTank;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
-import gtPlusPlus.core.config.Configuration;
+import gregtech.common.pollution.Pollution;
+import gregtech.common.pollution.PollutionConfig;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 
 public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements RecipeMapWorkable {
 
@@ -33,19 +33,19 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements
     public MTERocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
-        pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator
-            * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]);
-        pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator
-            * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMin = (int) (PollutionConfig.baseMinPollutionPerSecondRocketFuelGenerator
+            * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMax = (int) (PollutionConfig.baseMaxPollutionPerSecondRocketFuelGenerator
+            * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]);
     }
 
     public MTERocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription,
         final ITexture[][][] aTextures) {
         super(aName, aTier, 3, aDescription, aTextures);
-        pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator
-            * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]);
-        pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator
-            * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMin = (int) (PollutionConfig.baseMinPollutionPerSecondRocketFuelGenerator
+            * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]);
+        pollMax = (int) (PollutionConfig.baseMaxPollutionPerSecondRocketFuelGenerator
+            * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]);
     }
 
     @Override
@@ -233,7 +233,7 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements
                         && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) {
                         int aSafeFloor = (int) Math.max(((tFluidAmountToUse * tConsumed) / 3), 1);
                         this.mFluid.amount -= aSafeFloor;
-                        PollutionUtils.addPollution(getBaseMetaTileEntity(), 10 * getPollution());
+                        Pollution.addPollution(getBaseMetaTileEntity(), 10 * getPollution());
                     }
                 }
             }
@@ -247,7 +247,7 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements
                     if (aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tEmptyContainer)) {
                         aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true);
                         aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
-                        PollutionUtils.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
+                        Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2);
                     }
                 }
             }