aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java4
-rw-r--r--src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java6
-rw-r--r--src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java4
-rw-r--r--src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java4
-rw-r--r--src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java10
-rw-r--r--src/main/java/bartworks/common/tileentities/multis/mega/MegaMultiBlockBase.java6
-rw-r--r--src/main/java/ggfab/mte/MTEAdvAssLine.java6
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java4
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java22
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java4
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java8
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java3
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java216
-rw-r--r--src/main/java/gregtech/api/util/ExoticEnergyInputHelper.java12
-rw-r--r--src/main/java/gregtech/api/util/GTUtil.java3
-rw-r--r--src/main/java/gregtech/api/util/GTUtility.java10
-rw-r--r--src/main/java/gregtech/api/util/ValidMTEList.java60
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEDrillerBase.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java24
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java10
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java6
-rw-r--r--src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java16
-rw-r--r--src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java10
-rw-r--r--src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java14
-rw-r--r--src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java62
47 files changed, 339 insertions, 324 deletions
diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
index 80f851167d..46f5e66649 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
@@ -28,8 +28,8 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW;
import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
import static gregtech.api.util.GTUtility.getColoredTierNameFromTier;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.ArrayList;
import java.util.Arrays;
@@ -372,7 +372,7 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase<MTECircuit
public ArrayList<ItemStack> getStoredInputs() {
if (mode == 0) {
ArrayList<ItemStack> rList = new ArrayList<>();
- for (MTEHatchInputBus tHatch : filterValidMTEs(mInputBusses)) {
+ for (MTEHatchInputBus tHatch : validMTEList(mInputBusses)) {
tHatch.mRecipeMap = this.getRecipeMap();
for (int i = 0; i < tHatch.getBaseMetaTileEntity()
.getSizeInventory(); i++) {
diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java
index 73f6593d4f..3250c7ce0d 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java
@@ -18,7 +18,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GTValues.AuthorKuba;
import static gregtech.api.util.GTRecipeBuilder.HOURS;
import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.ArrayList;
import java.util.HashMap;
@@ -327,7 +327,7 @@ public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase<MTEHi
this.fuelsupply,
HTGRMaterials.MATERIALS_PER_FUEL * this.fueltype + HTGRMaterials.USABLE_FUEL_INDEX);
boolean storedAll = false;
- for (MTEHatchOutputBus tHatch : filterValidMTEs(mOutputBusses)) {
+ for (MTEHatchOutputBus tHatch : validMTEList(mOutputBusses)) {
if (tHatch.storeAll(iStack)) {
storedAll = true;
break;
@@ -357,7 +357,7 @@ public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase<MTEHi
int takecoolant = this.coolanttaking;
int drainedamount = 0;
- for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
+ for (MTEHatchInput tHatch : validMTEList(mInputHatches)) {
FluidStack tLiquid = tHatch.getFluid();
if (tLiquid != null && tLiquid.isFluidEqual(FluidRegistry.getFluidStack("ic2coolant", 1))) {
FluidStack drained = tHatch.drain(takecoolant, true);
diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java
index 064bc351fd..ee9b8a5baf 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java
@@ -19,7 +19,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -290,7 +290,7 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase<MTEThor
int takecoolant = this.coolanttaking;
int drainedamount = 0;
- for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
+ for (MTEHatchInput tHatch : validMTEList(mInputHatches)) {
FluidStack tLiquid = tHatch.getFluid();
if (tLiquid != null && tLiquid.isFluidEqual(FluidRegistry.getFluidStack("ic2coolant", 1))) {
FluidStack drained = tHatch.drain(takecoolant, true);
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 58f00bf77c..3f5b053b96 100644
--- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java
+++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java
@@ -24,7 +24,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAS
import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
import static gregtech.api.util.GTStructureUtility.ofCoil;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.ArrayList;
import java.util.Arrays;
@@ -358,7 +358,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase<MTEMegaBlastFurnace>
if (isOutputPollution) {
tOutputHatches = this.mPollutionOutputHatches;
int pollutionReduction = 0;
- for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
+ for (MTEHatchMuffler tHatch : validMTEList(mMufflerHatches)) {
pollutionReduction = 100 - tHatch.calculatePollutionReduction(100);
break;
}
diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java
index 3e2a73c725..4424bc62cc 100644
--- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java
+++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java
@@ -25,7 +25,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_G
import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
import static gregtech.api.util.GTStructureUtility.ofCoil;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.ArrayList;
import java.util.HashMap;
@@ -358,7 +358,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase<MTEMegaOilCracker> imp
public ArrayList<FluidStack> getStoredFluids() {
final ArrayList<FluidStack> rList = new ArrayList<>();
Map<Fluid, FluidStack> inputsFromME = new HashMap<>();
- for (final MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
+ for (final MTEHatchInput tHatch : validMTEList(mInputHatches)) {
tHatch.mRecipeMap = getRecipeMap();
if (tHatch instanceof MTEHatchInputME meHatch) {
for (FluidStack tFluid : meHatch.getStoredFluids()) {
@@ -381,7 +381,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase<MTEMegaOilCracker> imp
}
}
}
- for (final MTEHatchInput tHatch : filterValidMTEs(mMiddleInputHatches)) {
+ for (final MTEHatchInput tHatch : validMTEList(mMiddleInputHatches)) {
tHatch.mRecipeMap = getRecipeMap();
if (tHatch instanceof MTEHatchInputME meHatch) {
for (FluidStack tFluid : meHatch.getStoredFluids()) {
@@ -445,7 +445,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase<MTEMegaOilCracker> imp
@Override
protected void startRecipeProcessing() {
- for (MTEHatchInput hatch : filterValidMTEs(mMiddleInputHatches)) {
+ for (MTEHatchInput hatch : validMTEList(mMiddleInputHatches)) {
if (hatch instanceof IRecipeProcessingAwareHatch aware) {
aware.startRecipeProcessing();
}
@@ -456,7 +456,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase<MTEMegaOilCracker> imp
@Override
protected void endRecipeProcessing() {
super.endRecipeProcessing();
- for (MTEHatchInput hatch : filterValidMTEs(mMiddleInputHatches)) {
+ for (MTEHatchInput hatch : validMTEList(mMiddleInputHatches)) {
if (hatch instanceof IRecipeProcessingAwareHatch aware) {
setResultIfFailure(aware.endRecipeProcessing(this));
}
diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MegaMultiBlockBase.java b/src/main/java/bartworks/common/tileentities/multis/mega/MegaMultiBlockBase.java
index bac811ede8..02eda50607 100644
--- a/src/main/java/bartworks/common/tileentities/multis/mega/MegaMultiBlockBase.java
+++ b/src/main/java/bartworks/common/tileentities/multis/mega/MegaMultiBlockBase.java
@@ -1,6 +1,6 @@
package bartworks.common.tileentities.multis.mega;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.Arrays;
@@ -52,7 +52,7 @@ public abstract class MegaMultiBlockBase<T extends MegaMultiBlockBase<T>> extend
public String[] getInfoData() {
int mPollutionReduction = 0;
- for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
+ for (MTEHatchMuffler tHatch : validMTEList(mMufflerHatches)) {
mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
}
@@ -60,7 +60,7 @@ public abstract class MegaMultiBlockBase<T extends MegaMultiBlockBase<T>> extend
long storedEnergy = ttHatches[0];
long maxEnergy = ttHatches[1];
- for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
+ for (MTEHatchEnergy tHatch : validMTEList(mEnergyHatches)) {
storedEnergy += tHatch.getBaseMetaTileEntity()
.getStoredEU();
maxEnergy += tHatch.getBaseMetaTileEntity()
diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java
index 5474cdd04b..e02abdedd1 100644
--- a/src/main/java/ggfab/mte/MTEAdvAssLine.java
+++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java
@@ -21,8 +21,8 @@ import static gregtech.api.enums.HatchElement.OutputBus;
import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
import static gregtech.api.util.GTUtility.formatNumbers;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.ArrayList;
import java.util.Arrays;
@@ -725,7 +725,7 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine>
if (GTUtility.isStackValid(mInventory[1]) && isCorrectDataItem(mInventory[1], state)) {
rList.add(mInventory[1]);
}
- for (MTEHatchDataAccess tHatch : filterValidMTEs(mDataAccessHatches)) {
+ for (MTEHatchDataAccess tHatch : validMTEList(mDataAccessHatches)) {
rList.addAll(tHatch.getInventoryItems(stack -> isCorrectDataItem(stack, state)));
}
return rList;
@@ -978,7 +978,7 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine>
private void drainAllFluids(GTRecipe.RecipeAssemblyLine recipe, int parallel) {
GTRecipe.RecipeAssemblyLine
.consumeInputFluids(mInputHatches, parallel, recipe.mFluidInputs, curBatchFluidsFromME);
- for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) tHatch.updateSlots();
+ for (MTEHatchInput tHatch : validMTEList(mInputHatches)) tHatch.updateSlots();
}
@Override
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java
index be0fe5b4ce..b9c03aef0c 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java
@@ -4,7 +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.GTStructureUtility.*;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
@@ -148,7 +148,7 @@ public class MTECoolantTower extends MTETooltipMultiBlockBaseEM implements ICons
this.mMaxProgresstime = 20;
int steam = 0;
- for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) {
+ for (MTEHatchInput tHatch : validMTEList(mInputHatches)) {
steam += maybeDrainHatch(tHatch);
}
addOutput(GTModHandler.getDistilledWater(steam / 160));
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java
index d268db2f35..0c66084592 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java
@@ -7,7 +7,7 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
import static gregtech.api.enums.HatchElement.*;
import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
import static gregtech.api.util.GTStructureUtility.ofFrame;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.Arrays;
import java.util.Collection;
@@ -389,10 +389,10 @@ public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreci
private int checkEnergyHatchTier() {
int tier = 0;
- for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) {
+ for (MTEHatchEnergy tHatch : validMTEList(mEnergyHatches)) {
tier = Math.max(tHatch.mTier, tier);
}
- for (MTEHatch tHatch : filterValidMTEs(mExoticEnergyHatches)) {
+ for (MTEHatch tHatch : validMTEList(mExoticEnergyHatches)) {
tier = Math.max(tHatch.mTier, tier);
}
return tier;
@@ -420,28 +420,28 @@ public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreci
hatch.updateTexture(texture);
}
}
- for (MTEHatch hatch : filterValidMTEs(mInputHatches)) {
+ for (MTEHatch hatch : validMTEList(mInputHatches)) {
hatch.updateTexture(texture);
}
- for (MTEHatch hatch : filterValidMTEs(mInputBusses)) {
+ for (MTEHatch hatch : validMTEList(mInputBusses)) {
hatch.updateTexture(texture);
}
- for (MTEHatch hatch : filterValidMTEs(mOutputHatches)) {
+ for (MTEHatch hatch : validMTEList(mOutputHatches)) {
hatch.updateTexture(texture);
}
- for (MTEHatch hatch : filterValidMTEs(mOutputBusses)) {
+ for (MTEHatch hatch : validMTEList(mOutputBusses)) {
hatch.updateTexture(texture);
}
- for (MTEHatch hatch : filterValidMTEs(mEnergyHatches)) {
+ for (MTEHatch hatch : validMTEList(mEnergyHatches)) {
hatch.updateTexture(texture);
}
- for (MTEHatch hatch : filterValidMTEs(mMaintenanceHatches)) {
+ for (MTEHatch hatch : validMTEList(mMaintenanceHatches)) {
hatch.updateTexture(texture);
}
- for (MTEHatch hatch : filterValidMTEs(mMufflerHatches)) {
+ for (MTEHatch hatch : validMTEList(mMufflerHatches)) {
hatch.updateTexture(texture);
}
- for (MTEHatch hatch : filterValidMTEs(mExoticEnergyHatches)) {
+ for (MTEHatch hatch : validMTEList(mExoticEnergyHatches)) {
hatch.updateTexture(texture);
}
}
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java
index b14395dc20..d07597418f 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java
@@ -5,7 +5,7 @@ import static gregtech.api.enums.Textures.BlockIcons.*;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
import static gregtech.api.util.GTStructureUtility.filterByMTETier;
import static gregtech.api.util.GTStructureUtility.ofFrame;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.List;
@@ -300,7 +300,7 @@ public abstract class MTELargeFusionComputer extends MTETooltipMultiBlockBaseEM
long energyLimit = getSingleHatchPower();
List<MTEHatch> hatches = getExoticAndNormalEnergyHatchList();
- for (MTEHatch hatch : filterValidMTEs(hatches)) {
+ for (MTEHatch hatch : validMTEList(hatches)) {
long consumableEnergy = Math.min(hatch.getEUVar(), energyLimit);
long receivedEnergy = Math
.min(consumableEnergy, maxEUStore() - aBaseMetaTileEntity.getStoredEU());
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java
index ea36b53651..7b06dbb96d 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java
@@ -7,7 +7,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
import static gregtech.api.enums.HatchElement.*;
import static gregtech.api.util.GTStructureUtility.*;
-import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.ArrayList;
@@ -229,7 +229,7 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTEL
public long getMaximumOutput() {
long aTotal = 0;
- for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) {
+ for (MTEHatchDynamo aDynamo : validMTEList(mDynamoHatches)) {
long aVoltage = aDynamo.maxEUOutput();
aTotal = aDynamo.maxAmperesOut() * aVoltage;
break;
@@ -240,7 +240,7 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTEL
@Override
public String[] getInfoData() {
int mPollutionReduction = 0;
- for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
+ for (MTEHatchMuffler tHatch : validMTEList(mMufflerHatches)) {
mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
}
@@ -264,7 +264,7 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTEL
long storedEnergy = 0;
long maxEnergy = 0;
- for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) {
+ for (MTEHatchDynamo tHatch : validMTEList(mDynamoHatches)) {
storedEnergy += tHatch.getBaseMetaTileEntity()
.getStoredEU();
maxEnergy += tHatch.getBaseMetaTileEntity()
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java
index 565406e456..29a67fa099 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEExtendedPowerMultiBlockBase.java
@@ -2,6 +2,7 @@ package gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.GTValues.VN;
import static gregtech.api.util.GTUtility.filterValidMTEs;
+import static gregtech.api.util.GTUtility.validMTEList;
import java.util.ArrayList;
import java.util.List;
@@ -145,7 +146,7 @@ public abstract class MTEExtendedPowerMultiBlockBase<T extends MTEEnhancedMultiB
@Override
public String[] getInfoData() {
int mPollutionReduction = 0;
- for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) {
+ for (MTEHatchMuffler tHatch : validMTEList(mMufflerHatches)) {
mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
index a6526ac6fa..b677f6ae24 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
@@ -4,6 +4,7 @@ import static gregtech.api.enums.GTValues.V;
import static gregtech.api.enums.GTValues.VN;
import static gregtech.api.util.GTUtility.filterValidMTEs;
import static gregtech.api.util.GTUtility.formatNumbers;
+import static gregtech.api.util.GTUtility.validMTEList;
import static mcp.mobius.waila.api.SpecialChars.GREEN;
import static mcp.mobius.waila.api.SpecialChars.RED;
import static mcp.mobius.waila.api.SpecialChars.RESET;
@@ -508,7 +509,7 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity
if (!shouldCheckMaintenance()) return;
if (getRepairStatus() != getIdealStatus()) {
- for (MTEHatchMaintenance tHatch : filterValidMTEs(mMaintenanceHatches)) {
+ for (MTEH