From 36acbb9baed7dae4e19fde7a95852b7d002b2f5c Mon Sep 17 00:00:00 2001
From: Abdiel Kavash <19243993+AbdielKavash@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:08:11 -0600
Subject: Follow up fixes for multiple muffler hatches. (#3505)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../multi/production/turbines/MTELargerTurbineBase.java   | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
index 1623346299..e96493351e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
@@ -41,7 +41,6 @@ import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
 import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
-import gregtech.api.metatileentity.implementations.MTEHatchMuffler;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.util.GTUtility;
@@ -120,7 +119,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
     protected int storedFluid = 0;
     protected int counter = 0;
     protected boolean looseFit = false;
-    protected double mufflerReduction = 1;
     protected float[] flowMultipliers = new float[] { 1, 1, 1 };
 
     public ITexture frontFace = new GTPPRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
@@ -188,14 +186,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
         return getPollutionPerSecond(null) > 0;
     }
 
-    public final double getMufflerReduction() {
-        double totalReduction = 0;
-        for (MTEHatchMuffler tHatch : validMTEList(mMufflerHatches)) {
-            totalReduction += ((double) tHatch.calculatePollutionReduction(100)) / 100;
-        }
-        return totalReduction / 4;
-    }
-
     @Override
     public void clearHatches() {
         super.clearHatches();
@@ -229,7 +219,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
                     + mOutputHatches.size());
             return false;
         }
-        mufflerReduction = getMufflerReduction();
         return aStructure;
     }
 
@@ -559,8 +548,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
 
     @Override
     public String[] getExtraInfoData() {
-        int mPollutionReduction = (int) (100 * mufflerReduction);
-
         String tRunning = mMaxProgresstime > 0
             ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("GT5U.turbine.running.true")
                 + EnumChatFormatting.RESET
@@ -640,7 +627,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
             StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + aTurbineDamage,
             StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": "
                 + EnumChatFormatting.GREEN
-                + GTUtility.formatNumbers(mPollutionReduction)
+                + getAveragePollutionPercentage()
                 + EnumChatFormatting.RESET
                 + " %" };
     }
-- 
cgit