Cleanup isValidMetaTileEntity

2 files changed, 37 insertions, 44 deletions

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();