Skip to content

Commit 9cfd091

Browse files
committed
Move canFunction to a method on TileEntityMekanism
1 parent 47807de commit 9cfd091

File tree

53 files changed

+103
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+103
-108
lines changed

src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected boolean onUpdateServer() {
7171
boolean sendUpdatePacket = super.onUpdateServer();
7272
energySlot.drainContainer();
7373
fuelSlot.fillOrBurn();
74-
if (MekanismUtils.canFunction(this) && !bioFuelTank.isEmpty() &&
74+
if (canFunction() && !bioFuelTank.isEmpty() &&
7575
getEnergyContainer().insert(MekanismGeneratorsConfig.generators.bioGeneration.get(), Action.SIMULATE, AutomationType.INTERNAL).isZero()) {
7676
setActive(true);
7777
MekanismUtils.logMismatchedStackSize(bioFuelTank.shrinkStack(1, Action.EXECUTE), 1);

src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected boolean onUpdateServer() {
8383
energySlot.drainContainer();
8484
fuelSlot.fillTank();
8585

86-
if (!fuelTank.isEmpty() && MekanismUtils.canFunction(this) && getEnergyContainer().insert(generationRate, Action.SIMULATE, AutomationType.INTERNAL).isZero()) {
86+
if (!fuelTank.isEmpty() && canFunction() && getEnergyContainer().insert(generationRate, Action.SIMULATE, AutomationType.INTERNAL).isZero()) {
8787
setActive(true);
8888
if (!fuelTank.isEmpty()) {
8989
Fuel fuel = fuelTank.getType().get(Fuel.class);

src/generators/java/mekanism/generators/common/tile/TileEntityGenerator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import mekanism.common.inventory.container.sync.SyncableFloatingLong;
1818
import mekanism.common.tile.base.TileEntityMekanism;
1919
import mekanism.common.util.CableUtils;
20-
import mekanism.common.util.MekanismUtils;
2120
import net.minecraft.core.BlockPos;
2221
import net.minecraft.core.Direction;
2322
import net.minecraft.server.level.ServerLevel;
@@ -58,7 +57,7 @@ protected IEnergyContainerHolder getInitialEnergyContainers(IContentsListener li
5857
@Override
5958
protected boolean onUpdateServer() {
6059
boolean sendUpdatePacket = super.onUpdateServer();
61-
if (MekanismUtils.canFunction(this)) {
60+
if (canFunction()) {
6261
//TODO: Maybe even make some generators have a side config/ejector component and move this to the ejector component?
6362
if (outputCaches == null) {
6463
Direction direction = getDirection();

src/generators/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import net.minecraft.tags.FluidTags;
4141
import net.minecraft.world.level.block.state.BlockState;
4242
import net.minecraft.world.level.material.Fluids;
43-
import net.neoforged.neoforge.common.CommonHooks;
4443
import net.neoforged.neoforge.fluids.FluidStack;
4544
import org.jetbrains.annotations.NotNull;
4645
import org.jetbrains.annotations.Nullable;
@@ -116,7 +115,7 @@ protected boolean onUpdateServer() {
116115
fuelSlot.fillOrBurn();
117116
FloatingLong prev = getEnergyContainer().getEnergy().copyAsConst();
118117
heatCapacitor.handleHeat(getBoost().doubleValue());
119-
if (MekanismUtils.canFunction(this) && !getEnergyContainer().getNeeded().isZero()) {
118+
if (canFunction() && !getEnergyContainer().getNeeded().isZero()) {
120119
int fluidRate = MekanismGeneratorsConfig.generators.heatGenerationFluidRate.get();
121120
if (lavaTank.extract(fluidRate, Action.SIMULATE, AutomationType.INTERNAL).getAmount() == fluidRate) {
122121
setActive(true);

src/generators/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import mekanism.common.inventory.container.sync.SyncableBoolean;
1717
import mekanism.common.inventory.container.sync.SyncableFloatingLong;
1818
import mekanism.common.inventory.slot.EnergyInventorySlot;
19-
import mekanism.common.util.MekanismUtils;
2019
import mekanism.common.util.WorldUtils;
2120
import mekanism.generators.common.config.MekanismGeneratorsConfig;
2221
import mekanism.generators.common.registries.GeneratorsBlocks;
@@ -69,7 +68,7 @@ protected boolean onUpdateServer() {
6968
// since under the new rules, we can still generate power when it's raining, albeit at a
7069
// significant penalty.
7170
seesSun = checkCanSeeSun();
72-
if (seesSun && MekanismUtils.canFunction(this) && !getEnergyContainer().getNeeded().isZero()) {
71+
if (seesSun && canFunction() && !getEnergyContainer().getNeeded().isZero()) {
7372
setActive(true);
7473
FloatingLong production = getProduction();
7574
lastProductionAmount = production.subtract(getEnergyContainer().insert(production, Action.EXECUTE, AutomationType.INTERNAL));

src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import mekanism.common.inventory.container.sync.SyncableFloatingLong;
1616
import mekanism.common.inventory.slot.EnergyInventorySlot;
1717
import mekanism.common.tile.interfaces.IBoundingBlock;
18-
import mekanism.common.util.MekanismUtils;
1918
import mekanism.generators.common.config.MekanismGeneratorsConfig;
2019
import mekanism.generators.common.registries.GeneratorsBlocks;
2120
import net.minecraft.SharedConstants;
@@ -63,9 +62,9 @@ protected boolean onUpdateServer() {
6362
if (ticker % SharedConstants.TICKS_PER_SECOND == 0) {
6463
// Recalculate the current multiplier once a second
6564
currentMultiplier = getMultiplier();
66-
setActive(MekanismUtils.canFunction(this) && !currentMultiplier.isZero());
65+
setActive(canFunction() && !currentMultiplier.isZero());
6766
}
68-
if (!currentMultiplier.isZero() && MekanismUtils.canFunction(this) && !getEnergyContainer().getNeeded().isZero()) {
67+
if (!currentMultiplier.isZero() && canFunction() && !getEnergyContainer().getNeeded().isZero()) {
6968
getEnergyContainer().insert(MekanismGeneratorsConfig.generators.windGenerationMin.get().multiply(currentMultiplier), Action.EXECUTE, AutomationType.INTERNAL);
7069
}
7170
return sendUpdatePacket;

src/generators/java/mekanism/generators/common/tile/fission/TileEntityFissionReactorLogicAdapter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import mekanism.common.integration.computer.annotation.ComputerMethod;
1313
import mekanism.common.inventory.container.MekanismContainer;
1414
import mekanism.common.inventory.container.sync.SyncableEnum;
15-
import mekanism.common.util.MekanismUtils;
1615
import mekanism.common.util.NBTUtils;
1716
import mekanism.generators.common.GeneratorsLang;
1817
import mekanism.generators.common.base.IReactorLogic;
@@ -87,7 +86,7 @@ public RedstoneStatus getStatus() {
8786
if (multiblock.isFormed()) {
8887
switch (logicType) {
8988
case ACTIVATION -> {
90-
if (MekanismUtils.canFunction(this)) {
89+
if (canFunction()) {
9190
return RedstoneStatus.POWERED;
9291
}
9392
}
@@ -138,7 +137,7 @@ public void onPowerChange() {
138137
FissionReactorMultiblockData multiblock = getMultiblock();
139138
if (multiblock.isFormed()) {
140139
if (logicType == FissionReactorLogic.ACTIVATION) {
141-
multiblock.setActive(MekanismUtils.canFunction(this));
140+
multiblock.setActive(canFunction());
142141
}
143142
}
144143
}

src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import mekanism.common.util.EmitUtils;
5656
import mekanism.common.util.EnumUtils;
5757
import mekanism.common.util.FluidUtils;
58-
import mekanism.common.util.MekanismUtils;
5958
import net.minecraft.core.Direction;
6059
import net.minecraft.core.GlobalPos;
6160
import net.minecraft.nbt.CompoundTag;
@@ -259,7 +258,7 @@ public void handleEject(long gameTime) {
259258
//If we have at least one type to eject (we are not entirely empty)
260259
// then go through all the QEs and build up the target locations
261260
for (TileEntityQuantumEntangloporter qe : activeQEs.values()) {
262-
if (!MekanismUtils.canFunction(qe)) {
261+
if (!qe.canFunction()) {
263262
//Skip trying to eject for this QE if it can't function
264263
continue;
265264
}

src/main/java/mekanism/common/tile/TileEntityChemicalTank.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public TileEntityChemicalTank(IBlockProvider blockProvider, BlockPos pos, BlockS
8888
configComponent.setupIOConfig(TransmissionType.SLURRY, getSlurryTank(), RelativeSide.FRONT).setEjecting(true);
8989
ejectorComponent = new TileComponentEjector(this, () -> tier.getOutput());
9090
ejectorComponent.setOutputData(configComponent, TransmissionType.GAS, TransmissionType.INFUSION, TransmissionType.PIGMENT, TransmissionType.SLURRY)
91-
.setCanEject(type -> MekanismUtils.canFunction(this) && (tier == ChemicalTankTier.CREATIVE || dumping != GasMode.DUMPING));
91+
.setCanEject(type -> canFunction() && (tier == ChemicalTankTier.CREATIVE || dumping != GasMode.DUMPING));
9292
}
9393

9494
@Override

src/main/java/mekanism/common/tile/TileEntityEnergyCube.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public TileEntityEnergyCube(IBlockProvider blockProvider, BlockPos pos, BlockSta
5959
configComponent.setupIOConfig(TransmissionType.ITEM, chargeSlot, dischargeSlot, RelativeSide.FRONT, true).setCanEject(false);
6060
configComponent.setupIOConfig(TransmissionType.ENERGY, energyContainer, RelativeSide.FRONT).setEjecting(true);
6161
ejectorComponent = new TileComponentEjector(this, () -> tier.getOutput());
62-
ejectorComponent.setOutputData(configComponent, TransmissionType.ENERGY).setCanEject(type -> MekanismUtils.canFunction(this));
62+
ejectorComponent.setOutputData(configComponent, TransmissionType.ENERGY).setCanEject(type -> canFunction());
6363
}
6464

6565
@Override

0 commit comments

Comments
 (0)