diff options
Diffstat (limited to 'src/main/java/tectech/thing/metaTileEntity')
4 files changed, 51 insertions, 51 deletions
diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java index 87e969e606..25dd5f6ec6 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java @@ -6,7 +6,7 @@ import static gregtech.api.enums.GTValues.V; import static gregtech.api.enums.HatchElement.Energy; import static gregtech.api.enums.HatchElement.Maintenance; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gregtech.api.util.GTUtility.validMTEList; import static net.minecraft.util.StatCollector.translateToLocal; import java.util.ArrayList; @@ -174,7 +174,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - for (MTEHatchRack rack : filterValidMTEs(eRacks)) { + for (MTEHatchRack rack : validMTEList(eRacks)) { rack.getBaseMetaTileEntity() .setActive(false); } @@ -203,7 +203,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon return false; } eCertainMode = (byte) Math.min(totalLen / 3, 5); - for (MTEHatchRack rack : filterValidMTEs(eRacks)) { + for (MTEHatchRack rack : validMTEList(eRacks)) { rack.getBaseMetaTileEntity() .setActive(iGregTechTileEntity.isActive()); } @@ -249,7 +249,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon && !aBaseMetaTileEntity.isActive() && aTick % 20 == CommonValues.MULTI_CHECK_AT) { double maxTemp = 0; - for (MTEHatchRack rack : filterValidMTEs(eRacks)) { + for (MTEHatchRack rack : validMTEList(eRacks)) { if (rack.heat > maxTemp) { maxTemp = rack.heat; } @@ -280,7 +280,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon short thingsActive = 0; int rackComputation; - for (MTEHatchRack rack : filterValidMTEs(eRacks)) { + for (MTEHatchRack rack : validMTEList(eRacks)) { if (rack.heat > maxTemp) { maxTemp = rack.heat; } @@ -447,7 +447,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon @Override public void onRemoval() { super.onRemoval(); - for (MTEHatchRack rack : filterValidMTEs(eRacks)) { + for (MTEHatchRack rack : validMTEList(eRacks)) { rack.getBaseMetaTileEntity() .setActive(false); } @@ -470,7 +470,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon public void stopMachine(@Nonnull ShutDownReason reason) { super.stopMachine(reason); eAvailableData = 0; - for (MTEHatchRack rack : filterValidMTEs(eRacks)) { + for (MTEHatchRack rack : validMTEList(eRacks)) { rack.getBaseMetaTileEntity() .setActive(false); } @@ -479,7 +479,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon @Override protected void afterRecipeCheckFailed() { super.afterRecipeCheckFailed(); - for (MTEHatchRack rack : filterValidMTEs(eRacks)) { + for (MTEHatchRack rack : validMTEList(eRacks)) { rack.getBaseMetaTileEntity() .setActive(false); } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java index 6f29160d48..153a5a52ee 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java @@ -8,7 +8,7 @@ import static gregtech.api.enums.HatchElement.Energy; import static gregtech.api.enums.HatchElement.Maintenance; import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static gregtech.api.util.GTUtility.filterValidMTEs; +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; @@ -179,7 +179,7 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - for (MTEHatchObjectHolder rack : filterValidMTEs(eHolders)) { + for (MTEHatchObjectHolder rack : validMTEList(eHolders)) { rack.getBaseMetaTileEntity() .setActive(false); } @@ -189,7 +189,7 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon return false; } - for (MTEHatchObjectHolder rack : filterValidMTEs(eHolders)) { + for (MTEHatchObjectHolder rack : validMTEList(eHolders)) { rack.getBaseMetaTileEntity() .setActive(iGregTechTileEntity.isActive()); } @@ -322,13 +322,13 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon public String[] getInfoData() { long storedEnergy = 0; long maxEnergy = 0; - for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy tHatch : validMTEList(mEnergyHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() .getEUCapacity(); } - for (MTEHatchEnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) { + for (MTEHatchEnergyMulti tHatch : validMTEList(eEnergyMulti)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java index 73a8a8925c..fc160411e4 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java @@ -11,7 +11,7 @@ import static gregtech.api.enums.HatchElement.Maintenance; import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gregtech.api.util.GTStructureUtility.ofFrame; -import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gregtech.api.util.GTUtility.validMTEList; import static java.lang.Math.min; import static net.minecraft.util.StatCollector.translateToLocal; @@ -457,7 +457,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - for (MTEHatchCapacitor cap : filterValidMTEs(eCapacitorHatches)) { + for (MTEHatchCapacitor cap : validMTEList(eCapacitorHatches)) { cap.getBaseMetaTileEntity() .setActive(false); } @@ -466,7 +466,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc mTier = -1; if (structureCheck_EM("main", 3, 16, 0)) { - for (MTEHatchCapacitor cap : filterValidMTEs(eCapacitorHatches)) { + for (MTEHatchCapacitor cap : validMTEList(eCapacitorHatches)) { cap.getBaseMetaTileEntity() .setActive(iGregTechTileEntity.isActive()); } @@ -522,7 +522,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc mMaxProgresstime = 20; vTier = -1; long[] capacitorData; - for (MTEHatchCapacitor cap : filterValidMTEs(eCapacitorHatches)) { + for (MTEHatchCapacitor cap : validMTEList(eCapacitorHatches)) { if (cap.getCapacitors()[0] > vTier) { vTier = (int) cap.getCapacitors()[0]; } @@ -540,7 +540,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc } outputVoltageMax = V[vTier + 1]; - for (MTEHatchCapacitor cap : filterValidMTEs(eCapacitorHatches)) { + for (MTEHatchCapacitor cap : validMTEList(eCapacitorHatches)) { cap.getBaseMetaTileEntity() .setActive(true); capacitorData = cap.getCapacitors(); @@ -620,7 +620,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc super.onRemoval(); if (!getBaseMetaTileEntity().isClientSide()) { TeslaUtil.teslaSimpleNodeSetRemove(this); - for (MTEHatchCapacitor cap : filterValidMTEs(eCapacitorHatches)) { + for (MTEHatchCapacitor cap : validMTEList(eCapacitorHatches)) { cap.getBaseMetaTileEntity() .setActive(false); } @@ -723,7 +723,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc @Override public void stopMachine(@Nonnull ShutDownReason reason) { super.stopMachine(reason); - for (MTEHatchCapacitor cap : filterValidMTEs(eCapacitorHatches)) { + for (MTEHatchCapacitor cap : validMTEList(eCapacitorHatches)) { cap.getBaseMetaTileEntity() .setActive(false); } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index dab072e0a9..140fb80ae2 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -9,7 +9,7 @@ import static gregtech.api.enums.HatchElement.Muffler; import static gregtech.api.enums.HatchElement.OutputBus; import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; -import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gregtech.api.util.GTUtility.validMTEList; import static java.lang.Math.min; import static tectech.thing.casing.BlockGTCasingsTT.texturePage; @@ -401,13 +401,13 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT public String[] getInfoData() { // TODO Do it long storedEnergy = 0; long maxEnergy = 0; - for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy tHatch : validMTEList(mEnergyHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() .getEUCapacity(); } - for (MTEHatchEnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) { + for (MTEHatchEnergyMulti tHatch : validMTEList(eEnergyMulti)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() @@ -982,7 +982,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT } boolean busy = mMaxProgresstime > 0; if (busy) { // write from buffer to hatches only - for (MTEHatchParam hatch : filterValidMTEs(eParamHatches)) { + for (MTEHatchParam hatch : validMTEList(eParamHatches)) { if (hatch.param < 0) { continue; } @@ -995,7 +995,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT hatch.input1D = parametrization.iParamsOut[hatchId + 10]; } } else { // if has nothing to do update all - for (MTEHatchParam hatch : filterValidMTEs(eParamHatches)) { + for (MTEHatchParam hatch : validMTEList(eParamHatches)) { if (hatch.param < 0) { continue; } @@ -1243,18 +1243,18 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT mMufflerHatches.clear(); mMaintenanceHatches.clear(); - for (MTEHatchDataConnector<?> hatch_data : filterValidMTEs(eOutputData)) { + for (MTEHatchDataConnector<?> hatch_data : validMTEList(eOutputData)) { hatch_data.id = -1; } - for (MTEHatchDataConnector<?> hatch_data : filterValidMTEs(eInputData)) { + for (MTEHatchDataConnector<?> hatch_data : validMTEList(eInputData)) { hatch_data.id = -1; } - for (MTEHatchUncertainty hatch : filterValidMTEs(eUncertainHatches)) { + for (MTEHatchUncertainty hatch : validMTEList(eUncertainHatches)) { hatch.getBaseMetaTileEntity() .setActive(false); } - for (MTEHatchParam hatch : filterValidMTEs(eParamHatches)) { + for (MTEHatchParam hatch : validMTEList(eParamHatches)) { hatch.getBaseMetaTileEntity() .setActive(false); } @@ -1270,19 +1270,19 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT protected void setupHatches_EM() { short id = 1; - for (MTEHatchDataConnector<?> hatch_data : filterValidMTEs(eOutputData)) { + for (MTEHatchDataConnector<?> hatch_data : validMTEList(eOutputData)) { hatch_data.id = id++; } id = 1; - for (MTEHatchDataConnector<?> hatch_data : filterValidMTEs(eInputData)) { + for (MTEHatchDataConnector<?> hatch_data : validMTEList(eInputData)) { hatch_data.id = id++; } - for (MTEHatchUncertainty hatch : filterValidMTEs(eUncertainHatches)) { + for (MTEHatchUncertainty hatch : validMTEList(eUncertainHatches)) { hatch.getBaseMetaTileEntity() .setActive(true); } - for (MTEHatchParam hatch : filterValidMTEs(eParamHatches)) { + for (MTEHatchParam hatch : validMTEList(eParamHatches)) { hatch.getBaseMetaTileEntity() .setActive(true); } @@ -1296,7 +1296,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT maxEUinputMax = V[0]; maxEUoutputMin = V[15]; maxEUoutputMax = V[0]; - for (MTEHatchEnergy hatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy hatch : validMTEList(mEnergyHatches)) { if (hatch.maxEUInput() < maxEUinputMin) { maxEUinputMin = hatch.maxEUInput(); } @@ -1304,7 +1304,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT maxEUinputMax = hatch.maxEUInput(); } } - for (MTEHatchEnergyMulti hatch : filterValidMTEs(eEnergyMulti)) { + for (MTEHatchEnergyMulti hatch : validMTEList(eEnergyMulti)) { if (hatch.maxEUInput() < maxEUinputMin) { maxEUinputMin = hatch.maxEUInput(); } @@ -1312,7 +1312,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT maxEUinputMax = hatch.maxEUInput(); } } - for (MTEHatchDynamo hatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo hatch : validMTEList(mDynamoHatches)) { if (hatch.maxEUOutput() < maxEUoutputMin) { maxEUoutputMin = hatch.maxEUOutput(); } @@ -1320,7 +1320,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT maxEUoutputMax = hatch.maxEUOutput(); } } - for (MTEHatchDynamoMulti hatch : filterValidMTEs(eDynamoMulti)) { + for (MTEHatchDynamoMulti hatch : validMTEList(eDynamoMulti)) { if (hatch.maxEUOutput() < maxEUoutputMin) { maxEUoutputMin = hatch.maxEUOutput(); } @@ -1331,16 +1331,16 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT eMaxAmpereFlow = 0; eMaxAmpereGen = 0; // counts only full amps - for (MTEHatchEnergy hatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy hatch : validMTEList(mEnergyHatches)) { eMaxAmpereFlow += hatch.maxEUInput() / maxEUinputMin; } - for (MTEHatchEnergyMulti hatch : filterValidMTEs(eEnergyMulti)) { + for (MTEHatchEnergyMulti hatch : validMTEList(eEnergyMulti)) { eMaxAmpereFlow += hatch.maxEUInput() / maxEUinputMin * hatch.Amperes; } - for (MTEHatchDynamo hatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo hatch : validMTEList(mDynamoHatches)) { eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin; } - for (MTEHatchDynamoMulti hatch : filterValidMTEs(eDynamoMulti)) { + for (MTEHatchDynamoMulti hatch : validMTEList(eDynamoMulti)) { eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin * hatch.Amperes; } } else { @@ -1361,7 +1361,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT protected final void powerPass(IGregTechTileEntity aBaseMetaTileEntity) { long euVar; - for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo tHatch : validMTEList(mDynamoHatches)) { euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); if (tHatch.getBaseMetaTileEntity() .getStoredEU() <= tHatch.maxEUStore() - euVar @@ -1372,7 +1372,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT .getStoredEU() + euVar); } } - for (MTEHatchDynamoMulti tHatch : filterValidMTEs(eDynamoMulti)) { + for (MTEHatchDynamoMulti tHatch : validMTEList(eDynamoMulti)) { euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); if (tHatch.getBaseMetaTileEntity() .getStoredEU() <= tHatch.maxEUStore() - euVar @@ -1387,7 +1387,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT protected final void powerPass_EM(IGregTechTileEntity aBaseMetaTileEntity) { long euVar; - for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo tHatch : validMTEList(mDynamoHatches)) { euVar = tHatch.maxEUOutput(); if (tHatch.getBaseMetaTileEntity() .getStoredEU() <= tHatch.maxEUStore() - euVar @@ -1397,7 +1397,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT .getStoredEU() + euVar); } } - for (MTEHatchDynamoMulti tHatch : filterValidMTEs(eDynamoMulti)) { + for (MTEHatchDynamoMulti tHatch : validMTEList(eDynamoMulti)) { euVar = tHatch.maxEUOutput() * tHatch.Amperes; if (tHatch.getBaseMetaTileEntity() .getStoredEU() <= tHatch.maxEUStore() - euVar @@ -1416,7 +1416,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT protected final void powerInput() { long euVar; - for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy tHatch : validMTEList(mEnergyHatches)) { if (getEUVar() > getMinimumStoredEU()) { break; } @@ -1426,7 +1426,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT setEUVar(getEUVar() + euVar); } } - for (MTEHatchEnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) { + for (MTEHatchEnergyMulti tHatch : validMTEList(eEnergyMulti)) { if (getEUVar() > getMinimumStoredEU()) { break; } @@ -1440,7 +1440,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT protected final void powerInput_EM() { long euVar; - for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy tHatch : validMTEList(mEnergyHatches)) { if (getEUVar() > getMinimumStoredEU()) { break; } @@ -1450,7 +1450,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT setEUVar(getEUVar() + euVar); } } - for (MTEHatchEnergyMulti tHatch : filterValidMTEs(eEnergyMulti)) { + for (MTEHatchEnergyMulti tHatch : validMTEList(eEnergyMulti)) { if (getEUVar() > getMinimumStoredEU()) { break; } @@ -1558,7 +1558,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT } long euVar = EU * Amperes; long diff; - for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo tHatch : validMTEList(mDynamoHatches)) { if (tHatch.maxEUOutput() < EU) { explodeMultiblock(); } @@ -1576,7 +1576,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT } } } - for (MTEHatchDynamoMulti tHatch : filterValidMTEs(eDynamoMulti)) { + for (MTEHatchDynamoMulti tHatch : validMTEList(eDynamoMulti)) { if (tHatch.maxEUOutput() < EU) { explodeMultiblock(); } |