diff options
| author | miozune <miozune@gmail.com> | 2023-10-06 01:44:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-05 18:44:24 +0200 |
| commit | 91a57a990837879d5cb8e8e04ed0c7a6f973618c (patch) | |
| tree | eab9dfd871059d4f207eb5d48e3d4fda3ab49158 /src | |
| parent | b4ccbd63c5d953f0bd53910a474f4511efc38111 (diff) | |
| download | GT5-Unofficial-91a57a990837879d5cb8e8e04ed0c7a6f973618c.tar.gz GT5-Unofficial-91a57a990837879d5cb8e8e04ed0c7a6f973618c.tar.bz2 GT5-Unofficial-91a57a990837879d5cb8e8e04ed0c7a6f973618c.zip | |
Cleanup isValidMetaTileEntity and some more (#245)
* Cleanup isValidMetaTileEntity
* Remove empty Javadoc tags
* Remove unused classes
Diffstat (limited to 'src')
6 files changed, 182 insertions, 1763 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index 46f325988a..37fa0837e3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -14,6 +14,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GT_Utility.filterValidMTEs; import static net.minecraft.util.StatCollector.translateToLocal; import java.util.ArrayList; @@ -55,7 +56,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; @@ -164,10 +164,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - rack.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Rack rack : filterValidMTEs(eRacks)) { + rack.getBaseMetaTileEntity().setActive(false); } eRacks.clear(); if (!structureCheck_EM("front", 1, 2, 0)) { @@ -194,10 +192,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB return false; } eCertainMode = (byte) Math.min(totalLen / 3, 5); - for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - rack.getBaseMetaTileEntity().setActive(iGregTechTileEntity.isActive()); - } + for (GT_MetaTileEntity_Hatch_Rack rack : filterValidMTEs(eRacks)) { + rack.getBaseMetaTileEntity().setActive(iGregTechTileEntity.isActive()); } return eUncertainHatches.size() == 1; } @@ -224,10 +220,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB && !aBaseMetaTileEntity.isActive() && aTick % 20 == MULTI_CHECK_AT) { double maxTemp = 0; - for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { - if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - continue; - } + for (GT_MetaTileEntity_Hatch_Rack rack : filterValidMTEs(eRacks)) { if (rack.heat > maxTemp) { maxTemp = rack.heat; } @@ -258,10 +251,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB short thingsActive = 0; int rackComputation; - for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { - if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - continue; - } + for (GT_MetaTileEntity_Hatch_Rack rack : filterValidMTEs(eRacks)) { if (rack.heat > maxTemp) { maxTemp = rack.heat; } @@ -409,10 +399,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public void onRemoval() { super.onRemoval(); - for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - rack.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Rack rack : filterValidMTEs(eRacks)) { + rack.getBaseMetaTileEntity().setActive(false); } } @@ -432,20 +420,16 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB public void stopMachine() { super.stopMachine(); eAvailableData = 0; - for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - rack.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Rack rack : filterValidMTEs(eRacks)) { + rack.getBaseMetaTileEntity().setActive(false); } } @Override protected void afterRecipeCheckFailed() { super.afterRecipeCheckFailed(); - for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - rack.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Rack rack : filterValidMTEs(eRacks)) { + rack.getBaseMetaTileEntity().setActive(false); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index a1fcf44208..b6e5c16292 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -11,6 +11,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GT_Utility.filterValidMTEs; import static mcp.mobius.waila.api.SpecialChars.GREEN; import static mcp.mobius.waila.api.SpecialChars.RED; import static mcp.mobius.waila.api.SpecialChars.RESET; @@ -56,7 +57,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; @@ -330,10 +330,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - for (GT_MetaTileEntity_Hatch_Holder rack : eHolders) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - rack.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Holder rack : filterValidMTEs(eHolders)) { + rack.getBaseMetaTileEntity().setActive(false); } eHolders.clear(); @@ -341,10 +339,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB return false; } - for (GT_MetaTileEntity_Hatch_Holder rack : eHolders) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { - rack.getBaseMetaTileEntity().setActive(iGregTechTileEntity.isActive()); - } + for (GT_MetaTileEntity_Hatch_Holder rack : filterValidMTEs(eHolders)) { + rack.getBaseMetaTileEntity().setActive(iGregTechTileEntity.isActive()); } return eHolders.size() == 1; } @@ -487,17 +483,13 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB public String[] getInfoData() { long storedEnergy = 0; long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); - } + for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) { + storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); } - for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); - } + for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) { + storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); } return new String[] { translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 193a958c5d..4ed3520b8a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -17,6 +17,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksT import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GT_Utility.filterValidMTEs; import static java.lang.Math.min; import static net.minecraft.util.StatCollector.translateToLocal; @@ -90,7 +91,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; @@ -540,20 +540,16 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) { - if (isValidMetaTileEntity(cap)) { - cap.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Capacitor cap : filterValidMTEs(eCapacitorHatches)) { + cap.getBaseMetaTileEntity().setActive(false); } eCapacitorHatches.clear(); mTier = -1; if (structureCheck_EM("main", 3, 16, 0)) { - for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) { - if (isValidMetaTileEntity(cap)) { - cap.getBaseMetaTileEntity().setActive(iGregTechTileEntity.isActive()); - } + for (GT_MetaTileEntity_Hatch_Capacitor cap : filterValidMTEs(eCapacitorHatches)) { + cap.getBaseMetaTileEntity().setActive(iGregTechTileEntity.isActive()); } // Only recalculate offsets on orientation or rotation change @@ -600,10 +596,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock mMaxProgresstime = 20; vTier = -1; long[] capacitorData; - for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) { - if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) { - continue; - } + for (GT_MetaTileEntity_Hatch_Capacitor cap : filterValidMTEs(eCapacitorHatches)) { if (cap.getCapacitors()[0] > vTier) { vTier = (int) cap.getCapacitors()[0]; } @@ -621,10 +614,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } outputVoltageMax = V[vTier + 1]; - for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) { - if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) { - continue; - } + for (GT_MetaTileEntity_Hatch_Capacitor cap : filterValidMTEs(eCapacitorHatches)) { cap.getBaseMetaTileEntity().setActive(true); capacitorData = cap.getCapacitors(); if (capacitorData[0] < vTier) { @@ -701,10 +691,8 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock super.onRemoval(); if (!getBaseMetaTileEntity().isClientSide()) { teslaSimpleNodeSetRemove(this); - for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) { - cap.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Capacitor cap : filterValidMTEs(eCapacitorHatches)) { + cap.getBaseMetaTileEntity().setActive(false); } } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 1daee413e6..534b0d6d1a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -7,6 +7,7 @@ import static com.github.technus.tectech.util.CommonValues.*; import static com.github.technus.tectech.util.TT_Utility.getTier; import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; +import static gregtech.api.util.GT_Utility.filterValidMTEs; import static java.lang.Math.min; import java.util.ArrayList; @@ -315,11 +316,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM // region tooltip and scanner result - /** - * @param hatchNo - * @param paramID - * @return - */ public ArrayList<String> getFullLedDescriptionIn(int hatchNo, int paramID) { ArrayList<String> list = new ArrayList<>(); list.add( @@ -347,11 +343,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM return list; } - /** - * @param hatchNo - * @param paramID - * @return - */ public ArrayList<String> getFullLedDescriptionOut(int hatchNo, int paramID) { ArrayList<String> list = new ArrayList<>(); list.add( @@ -388,24 +379,18 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * scanner gives it - * - * @return */ @Override public String[] getInfoData() { // TODO Do it long storedEnergy = 0; long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); - } + for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) { + storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); } - for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); - } + for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) { + storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); } return new String[] { "Progress:", @@ -469,8 +454,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * should it work with scanner? HELL YES - * - * @return */ @Override public boolean isGivingInformation() { @@ -483,8 +466,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * add more textures - * - * @param aBlockIconRegister */ @Override @SideOnly(Side.CLIENT) @@ -496,14 +477,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * actually use textures - * - * @param aBaseMetaTileEntity - * @param side - * @param facing - * @param colorIndex - * @param aActive - * @param aRedstone - * @return */ @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, @@ -517,8 +490,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * should return your activity sound - * - * @return */ @SideOnly(Side.CLIENT) protected ResourceLocation getActivitySound() { @@ -527,8 +498,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * plays the sounds auto magically - * - * @param activitySound */ @SideOnly(Side.CLIENT) protected void soundMagic(ResourceLocation activitySound) { @@ -550,9 +519,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * is the thing inside controller a valid item to make the machine work - * - * @param itemStack - * @return */ @Override public boolean isCorrectMachinePart(ItemStack itemStack) { @@ -561,9 +527,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * how much damage to apply to thing in controller - not sure how it does it - * - * @param itemStack - * @return */ @Override public int getDamageToComponent(ItemStack itemStack) { @@ -589,11 +552,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * prevents spontaneous explosions when the chunks unloading would cause them should cover 3 chunks radius - * - * @return */ protected boolean areChunksAroundLoaded_EM() { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(this) && getBaseMetaTileEntity().isServerSide()) { + if (this.isValid() && getBaseMetaTileEntity().isServerSide()) { IGregTechTileEntity base = getBaseMetaTileEntity(); return base.getWorld().doChunksNearChunkExist(base.getXCoord(), base.getYCoord(), base.getZCoord(), 3); // todo check if it is actually checking if chunks are loaded @@ -736,8 +697,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * store data - * - * @param aNBT */ @Override public void saveNBTData(NBTTagCompound aNBT) { @@ -814,8 +773,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * load data - * - * @param aNBT */ @Override public void loadNBTData(NBTTagCompound aNBT) { @@ -942,8 +899,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * cyclic check even when not working, called LESS frequently - * - * @return */ private boolean cyclicUpdate() { if (cyclicUpdate_EM()) { @@ -955,8 +910,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * mining level... - * - * @return */ @Override public byte getTileEntityBaseType() { @@ -969,10 +922,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * internal check machine - * - * @param iGregTechTileEntity - * @param itemStack - * @return */ @Override public final boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { @@ -981,9 +930,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * internal check recipe - * - * @param itemStack - * @return */ @Override public final boolean checkRecipe(ItemStack itemStack) { // do recipe checks, based on "machine content and state" @@ -1013,8 +959,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM } boolean busy = mMaxProgresstime > 0; if (busy) { // write from buffer to hatches only - for (GT_MetaTileEntity_Hatch_Param hatch : eParamHatches) { - if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch) || hatch.param < 0) { + for (GT_MetaTileEntity_Hatch_Param hatch : filterValidMTEs(eParamHatches)) { + if (hatch.param < 0) { continue; } int hatchId = hatch.param; @@ -1026,8 +972,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM hatch.input1D = parametrization.iParamsOut[hatchId + 10]; } } else { // if has nothing to do update all - for (GT_MetaTileEntity_Hatch_Param hatch : eParamHatches) { - if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch) || hatch.param < 0) { + for (GT_MetaTileEntity_Hatch_Param hatch : filterValidMTEs(eParamHatches)) { + if (hatch.param < 0) { continue; } int hatchId = hatch.param; @@ -1065,9 +1011,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM /** * called every tick the machines is active - * - * @param aStack - * @return */ @Override public boolean onRunningTick(ItemStack aStack) { @@ -1274,38 +1217,36 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM mSolderingTool = true; mCrowbar = true; } else { - for (GT_MetaTileEntity_Hatch_Maintenance tHatch : mMaintenanceHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { - if (tHatch.mAuto - && !(mWrench && mScrewdriver && mSoftHammer && mHardHammer && mSolderingTool && mCrowbar)) { - tHatch.autoMaintainance(); - } - if (tHatch.mWrench) { - mWrench = true; - } - if (tHatch.mScrewdriver) { - mScrewdriver = true; - } - if (tHatch.mSoftHammer) { - mSoftHammer = true; - } - if (tHatch.mHardHammer) { - mHardHammer = true; - } - if (tHatch.mSolderingTool) { - mSolderingTool = true; - } - if (tHatch.mCrowbar) { - mCrowbar = true; - } - - tHatch.mWrench = false; - tHatch.mScrewdriver = false; - tHatch.mSoftHammer = false; - tHatch.mHardHammer = false; - tHatch.mSolderingTool = false; - tHatch.mCrowbar = false; + for (GT_MetaTileEntity_Hatch_Maintenance tHatch : filterValidMTEs(mMaintenanceHatches)) { + if (tHatch.mAuto + && !(mWrench && mScrewdriver && mSoftHammer && mHardHammer && mSolderingTool && mCrowbar)) { + tHatch.autoMaintainance(); + } + if (tHatch.mWrench) { + mWrench = true; + } + if (tHatch.mScrewdriver) { + mScrewdriver = true; } + if (tHatch.mSoftHammer) { + mSoftHammer = true; + } + if (tHatch.mHardHammer) { + mHardHammer = true; + } + if (tHatch.mSolderingTool) { + mSolderingTool = true; + } + if (tHatch.mCrowbar) { + mCrowbar = true; + } + + tHatch.mWrench = false; + tHatch.mScrewdriver = false; + tHatch.mSoftHammer = false; + tHatch.mHardHammer = false; + tHatch.mSolderingTool = false; + tHatch.mCrowbar = false; } } } @@ -1321,26 +1262,18 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM mMufflerHatches.clear(); mMaintenanceHatches.clear(); - for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : eOutputData) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch_data)) { - hatch_data.id = -1; - } + for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : filterValidMTEs(eOutputData)) { + hatch_data.id = -1; } - for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : eInputData) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch_data)) { - hatch_data.id = -1; - } + for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : filterValidMTEs(eInputData)) { + hatch_data.id = -1; } - for (GT_MetaTileEntity_Hatch_Uncertainty hatch : eUncertainHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - hatch.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Uncertainty hatch : filterValidMTEs(eUncertainHatches)) { + hatch.getBaseMetaTileEntity().setActive(false); } - for (GT_MetaTileEntity_Hatch_Param hatch : eParamHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - hatch.getBaseMetaTileEntity().setActive(false); - } + for (GT_MetaTileEntity_Hatch_Param hatch : filterValidMTEs(eParamHatches)) { + hatch.getBaseMetaTileEntity().setActive(false); } eUncertainHatches.clear(); @@ -1354,27 +1287,19 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM protected void setupHatches_EM() { short id = 1; - for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : eOutputData) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch_data)) { - hatch_data.id = id++; - } + for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : filterValidMTEs(eOutputData)) { + hatch_data.id = id++; } id = 1; - for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : eInputData) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch_data)) { - hatch_data.id = id++; - } + for (GT_MetaTileEntity_Hatch_DataConnector<?> hatch_data : filterValidMTEs(eInputData)) { + hatch_data.id = id++; } - for (GT_MetaTileEntity_Hatch_Uncertainty hatch : eUncertainHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - hatch.getBaseMetaTileEntity().setActive(true); - } + for (GT_MetaTileEntity_Hatch_Uncertainty hatch : filterValidMTEs(eUncertainHatches)) { + hatch.getBaseMetaTileEntity().setActive(true); } - for (GT_MetaTileEntity_Hatch_Param hatch : eParamHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - hatch.getBaseMetaTileEntity().setActive(true); - } + for (GT_MetaTileEntity_Hatch_Param hatch : filterValidMTEs(eParamHatches)) { + hatch.getBaseMetaTileEntity().setActive(true); } } @@ -1386,68 +1311,52 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM maxEUinputMax = V[0]; maxEUoutputMin = V[15]; maxEUoutputMax = V[0]; - for (GT_MetaTileEntity_Hatch_Energy hatch : mEnergyHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - if (hatch.maxEUInput() < maxEUinputMin) { - maxEUinputMin = hatch.maxEUInput(); - } - if (hatch.maxEUInput() > maxEUinputMax) { - maxEUinputMax = hatch.maxEUInput(); - } + for (GT_MetaTileEntity_Hatch_Energy hatch : filterValidMTEs(mEnergyHatches)) { + if (hatch.maxEUInput() < maxEUinputMin) { + maxEUinputMin = hatch.maxEUInput(); + } + if (hatch.maxEUInput() > maxEUinputMax) { + maxEUinputMax = hatch.maxEUInput(); } } - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : eEnergyMulti) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - if (hatch.maxEUInput() < maxEUinputMin) { - maxEUinputMin = hatch.maxEUInput(); - } - if (hatch.maxEUInput() > maxEUinputMax) { - maxEUinputMax = hatch.maxEUInput(); - } + for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : filterValidMTEs(eEnergyMulti)) { + if (hatch.maxEUInput() < maxEUinputMin) { + maxEUinputMin = hatch.maxEUInput(); + } + if (hatch.maxEUInput() > maxEUinputMax) { + maxEUinputMax = hatch.maxEUInput(); } } - for (GT_MetaTileEntity_Hatch_Dynamo hatch : mDynamoHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - if (hatch.maxEUOutput() < maxEUoutputMin) { - maxEUoutputMin = hatch.maxEUOutput(); - } - if (hatch.maxEUOutput() > maxEUoutputMax) { - maxEUoutputMax = hatch.maxEUOutput(); - } + for (GT_MetaTileEntity_Hatch_Dynamo hatch : filterValidMTEs(mDynamoHatches)) { + if (hatch.maxEUOutput() < maxEUoutputMin) { + maxEUoutputMin = hatch.maxEUOutput(); + } + if (hatch.maxEUOutput() > maxEUoutputMax) { + maxEUoutputMax = hatch.maxEUOutput(); } } - for (GT_MetaTileEntity_Hatch_DynamoMulti hatch : eDynamoMulti) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - if (hatch.maxEUOutput() < maxEUoutputMin) { - maxEUoutputMin = hatch.maxEUOutput(); - } - if (hatch.maxEUOutput() > maxEUoutputMax) { - maxEUoutputMax = hatch.maxEUOutput(); - } + for (GT_MetaTileEntity_Hatch_DynamoMulti hatch : filterValidMTEs(eDynamoMulti)) { + if (hatch.maxEUOutput() < maxEUoutputMin) { + maxEUoutputMin = hatch.maxEUOutput(); + } + if (hatch.maxEUOutput() > maxEUoutputMax) { + maxEUoutputMax = hatch.maxEUOutput(); } } eMaxAmpereFlow = 0; eMaxAmpereGen = 0; // counts only full amps - for (GT_MetaTileEntity_Hatch_Energy hatch : mEnergyHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - eMaxAmpereFlow += hatch.maxEUInput() / maxEUinputMin; - } + for (GT_MetaTileEntity_Hatch_Energy hatch : filterValidMTEs(mEnergyHatches)) { + eMaxAmpereFlow += hatch.maxEUInput() / maxEUinputMin; } - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : eEnergyMulti) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - eMaxAmpereFlow += hatch.maxEUInput() / maxEUinputMin * hatch.Amperes; - } + for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : filterValidMTEs(eEnergyMulti)) { + eMaxAmpereFlow += hatch.maxEUInput() / maxEUinputMin * hatch.Amperes; } - for (GT_MetaTileEntity_Hatch_Dynamo hatch : mDynamoHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin; - } + for (GT_MetaTileEntity_Hatch_Dynamo hatch : filterValidMTEs(mDynamoHatches)) { + eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin; } - for (GT_MetaTileEntity_Hatch_DynamoMulti hatch : eDynamoMulti) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { - eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin * hatch.Amperes; - } + for (GT_MetaTileEntity_Hatch_DynamoMulti hatch : filterValidMTEs(eDynamoMulti)) { + eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin * hatch.Amperes; } } else { maxEUinputMin = 0; @@ -1467,44 +1376,36 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM protected final void powerPass(IGregTechTileEntity aBaseMetaTileEntity) { long euVar; - for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { - euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); - if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar && aBaseMetaTileEntity - .decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, tHatch.maxAmperesOut()), false)) { - tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); - } + for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) { + euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); + if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar && aBaseMetaTileEntity + .decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, tHatch.maxAmperesOut()), false)) { + tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); } } - for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : eDynamoMulti) { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { - euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); - if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar && aBaseMetaTileEntity - .decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, tHatch.maxAmperesOut()), false)) { - tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); - } + for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : filterValidMTEs(eDynamoMulti)) { + euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); + |
