Cleanup isValidMetaTileEntity

5 files changed, 50 insertions, 61 deletions

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java
index c1edce0e15..4eadd4ed4b 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java
@@ -4,6 +4,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.api.util.GT_StructureUtility.*;
+import static gregtech.api.util.GT_Utility.filterValidMTEs;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -196,7 +197,7 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
         this.mMaxProgresstime = 20;
         int steam = 0;
 
-        for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) {
+        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
             steam += maybeDrainHatch(tHatch);
         }
         addOutput(GT_ModHandler.getDistilledWater(steam / 160));
@@ -204,7 +205,6 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
     }
 
     private int maybeDrainHatch(GT_MetaTileEntity_Hatch_Input tHatch) {
-        if (!isValidMetaTileEntity(tHatch)) return 0;
         if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) {
             int drained = 0;
             for (FluidStack maybeSteam : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) {
@@ -216,7 +216,7 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
     }
 
     private int maybeDrainSteam(GT_MetaTileEntity_Hatch_Input tHatch, FluidStack maybeSteam) {
-        if (!isValidMetaTileEntity(tHatch) || maybeSteam == null) return 0;
+        if (maybeSteam == null) return 0;
         if (!GT_Utility.areFluidsEqual(maybeSteam, GT_ModHandler.getSteam(1))) return 0;
         FluidStack defoSteam = tHatch.drain(ForgeDirection.UNKNOWN, maybeSteam, true);
         return defoSteam.amount;
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
index 184432225a..c40b2697b5 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
@@ -6,6 +6,7 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
 import static gregtech.api.enums.GT_HatchElement.*;
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GT_Utility.filterValidMTEs;
 
 import java.util.Collections;
 import java.util.stream.Collectors;
@@ -360,15 +361,11 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB
 
     private int checkEnergyHatchTier() {
         int tier = 0;
-        for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) {
-            if (isValidMetaTileEntity(tHatch)) {
-                tier = Math.max(tHatch.mTier, tier);
-            }
+        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+            tier = Math.max(tHatch.mTier, tier);
         }
-        for (GT_MetaTileEntity_Hatch tHatch : mExoticEnergyHatches) {
-            if (isValidMetaTileEntity(tHatch)) {
-                tier = Math.max(tHatch.mTier, tier);
-            }
+        for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
+            tier = Math.max(tHatch.mTier, tier);
         }
         return tier;
     }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
index fff5f848ed..8e11b31e36 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
@@ -5,6 +5,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
 import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import static gregtech.api.util.GT_Utility.filterValidMTEs;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -350,12 +351,10 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB
     }
 
     public void consumeAllLiquid(FluidStack liquid) {
-        for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) {
-            if (isValidMetaTileEntity(tHatch)) {
-                FluidStack tLiquid = tHatch.getFluid();
-                if (tLiquid != null && tLiquid.isFluidEqual(liquid)) {
-                    tHatch.drain(tLiquid.amount, true);
-                }
+        for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) {
+            FluidStack tLiquid = tHatch.getFluid();
+            if (tLiquid != null && tLiquid.isFluidEqual(liquid)) {
+                tHatch.drain(tLiquid.amount, true);
             }
         }
     }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java
index fe67924096..e44278743a 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java
@@ -7,6 +7,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static gregtech.api.enums.GT_HatchElement.*;
 import static gregtech.api.util.GT_StructureUtility.*;
+import static gregtech.api.util.GT_Utility.filterValidMTEs;
 
 import java.util.ArrayList;
 
@@ -224,12 +225,10 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends
 
     public long getMaximumOutput() {
         long aTotal = 0;
-        for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : mDynamoHatches) {
-            if (isValidMetaTileEntity(aDynamo)) {
-                long aVoltage = aDynamo.maxEUOutput();
-                aTotal = aDynamo.maxAmperesOut() * aVoltage;
-                break;
-            }
+        for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
+            long aVoltage = aDynamo.maxEUOutput();
+            aTotal = aDynamo.maxAmperesOut() * aVoltage;
+            break;
         }
         return aTotal;
     }
@@ -237,10 +236,8 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends
     @Override
     public String[] getInfoData() {
         int mPollutionReduction = 0;
-        for (GT_MetaTileEntity_Hatch_Muffler tHatch : mMufflerHatches) {
-            if (isValidMetaTileEntity(tHatch)) {
-                mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
-            }
+        for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) {
+            mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
         }
 
         String tRunning = mMaxProgresstime > 0
@@ -263,11 +260,9 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends
 
         long storedEnergy = 0;
         long maxEnergy = 0;
-        for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) {
-            if (isValidMetaTileEntity(tHatch)) {
-                storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU();
-                maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity();
-            }
+        for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) {
+            storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU();
+            maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity();
         }
         String[] ret = new String[] {
                 // 8 Lines available for information panels
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
index a10fe5bfc6..1e542f857d 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
@@ -3,6 +3,7 @@ package goodgenerator.blocks.tileEntity.base;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.api.util.GT_StructureUtility.ofFrame;
+import static gregtech.api.util.GT_Utility.filterValidMTEs;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -263,38 +264,35 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
             if (mStartUpCheck < 0) {
                 if (mMachine) {
                     if (this.mEnergyHatches != null) {
-                        for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches)
-                            if (isValidMetaTileEntity(tHatch)) {
-                                if (aBaseMetaTileEntity.getStoredEU()
-                                        + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore()
-                                        && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(
-                                                2048L * tierOverclock() * getMaxPara() * extraPara(100),
-                                                false)) {
-                                    aBaseMetaTileEntity.increaseStoredEnergyUnits(
+                        for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) {
+                            if (aBaseMetaTileEntity.getStoredEU()
+                                    + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore()
+                                    && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(
                                             2048L * tierOverclock() * getMaxPara() * extraPara(100),
-                                            true);
-                                } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore()
-                                        && tHatch.getBaseMetaTileEntity()
-                                                .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) {
-                                                    aBaseMetaTileEntity
-                                                            .increaseStoredEnergyUnits(2048L * tierOverclock(), true);
-                                                }
-                            }
+                                            false)) {
+                                aBaseMetaTileEntity.increaseStoredEnergyUnits(
+                                        2048L * tierOverclock() * getMaxPara() * extraPara(100),
+                                        true);
+                            } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore()
+                                    && tHatch.getBaseMetaTileEntity()
+                                            .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) {
+                                                aBaseMetaTileEntity
+                                                        .increaseStoredEnergyUnits(2048L * tierOverclock(), true);
+                                            }
+                        }
                     }
                     if (this.eEnergyMulti != null) {
-                        for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti)
-                            if (isValidMetaTileEntity(tHatch)) {
-                                if (aBaseMetaTileEntity.getStoredEU() + getSingleHatchPower() < maxEUStore()
-                                        && tHatch.getBaseMetaTileEntity()
-                                                .decreaseStoredEnergyUnits(getSingleHatchPower(), false)) {
-                                    aBaseMetaTileEntity.increaseStoredEnergyUnits(getSingleHatchPower(), true);
-                                } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore()
-                                        && tHatch.getBaseMetaTileEntity()
-                                                .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) {
-                                                    aBaseMetaTileEntity
-                                                            .increaseStoredEnergyUnits(2048L * tierOverclock(), true);
-                                                }
-                            }
+                        for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) {
+                            if (aBaseMetaTileEntity.getStoredEU() + getSingleHatchPower() < maxEUStore() && tHatch
+                                    .getBaseMetaTileEntity().decreaseStoredEnergyUnits(getSingleHatchPower(), false)) {
+                                aBaseMetaTileEntity.increaseStoredEnergyUnits(getSingleHatchPower(), true);
+                            } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore()
+                                    && tHatch.getBaseMetaTileEntity()
+                                            .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) {
+                                                aBaseMetaTileEntity
+                                                        .increaseStoredEnergyUnits(2048L * tierOverclock(), true);
+                                            }
+                        }
                     }
                     if (aBaseMetaTileEntity.getStoredEU() <= 0 && mMaxProgresstime > 0) {
                         stopMachine();