Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
Cleanup isValidMetaTileEntity and some more (#245)
Browse files Browse the repository at this point in the history 
* Cleanup isValidMetaTileEntity

* Remove empty Javadoc tags

* Remove unused classes
  • Loading branch information
@miozune
miozune authored Oct 5, 2023
1 parent b4ccbd6 commit 91a57a9
Show file tree
Hide file tree
Showing 6 changed files with 182 additions and 1,763 deletions.
42 changes: 13 additions & 29 deletions .../com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
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;
Expand Down Expand Up @@ -55,7 +56,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_MultiBlockBase;
import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
import gregtech.api.recipe.check.SimpleCheckRecipeResult;
Expand Down Expand Up @@ -164,10 +164,8 @@ protected void parametersInstantiation_EM() {

@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)) {
Expand All @@ -194,10 +192,8 @@ public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStac
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;
}
Expand All @@ -224,10 +220,7 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
&& !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;
}
Expand Down Expand Up @@ -258,10 +251,7 @@ protected CheckRecipeResult checkProcessing_EM() {
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;
}
Expand Down Expand Up @@ -409,10 +399,8 @@ protected ResourceLocation getActivitySound() {
@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);
}
}

Expand All @@ -432,20 +420,16 @@ protected long getAvailableData_EM() {
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);
}
}

Expand Down
30 changes: 11 additions & 19 deletions .../com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
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;
Expand Down Expand Up @@ -56,7 +57,6 @@
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;
Expand Down Expand Up @@ -330,21 +330,17 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

if (!structureCheck_EM("main", 1, 3, 4)) {
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;
}
Expand Down Expand Up @@ -487,17 +483,13 @@ public GT_Multiblock_Tooltip_Builder createTooltip() {
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) + ":",
Expand Down
30 changes: 9 additions & 21 deletions ...com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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;

Expand Down Expand Up @@ -90,7 +91,6 @@
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;
Expand Down Expand Up @@ -540,20 +540,16 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

@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
Expand Down Expand Up @@ -600,10 +596,7 @@ protected CheckRecipeResult checkProcessing_EM() {
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];
}
Expand All @@ -621,10 +614,7 @@ protected CheckRecipeResult checkProcessing_EM() {
}

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) {
Expand Down Expand Up @@ -701,10 +691,8 @@ public void onRemoval() {
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);
}
}
}
Expand Down
Loading

0 comments on commit 91a57a9

Please sign in to comment.