From 5f6011f705c75007b48735d02e590581c78ca8db Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Sun, 15 Sep 2024 23:30:13 +0200 Subject: Small optimizations & MultiBlockBase cleanup (#3197) Co-authored-by: Martin Robertz --- .../common/tileentities/multis/mega/MTEMegaBlastFurnace.java | 4 ++-- .../common/tileentities/multis/mega/MTEMegaOilCracker.java | 10 +++++----- .../common/tileentities/multis/mega/MegaMultiBlockBase.java | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/java/bartworks/common/tileentities/multis/mega') 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 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 imp public ArrayList getStoredFluids() { final ArrayList rList = new ArrayList<>(); Map 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 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 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 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> 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> 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() -- cgit