Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor MetaMachine to not expose item/fluid capabilities on the front #2830

Open
wants to merge 3 commits into
base: 1.20.1
Choose a base branch
from
+101 −0
Open

Refactor MetaMachine to not expose item/fluid capabilities on the front #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c860d8f
prevent machines from exposing fluid and item capabilities to the fro…
omergunr100 Feb 5, 2025
7ccf2aa
prevents rotating the front face if a cover that can't be placed on t…
omergunr100 Feb 5, 2025
1d5bcd8
remove the second null check.
omergunr100 Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,15 @@ public final boolean hasFrontFacing() {

public boolean isFacingValid(Direction facing) {
if (hasFrontFacing() && facing == getFrontFacing()) return false;
var coverContainer = getCoverContainer();
if (coverContainer.hasCover(facing)) {
// noinspection DataFlowIssue
var coverDefinition = coverContainer.getCoverAtSide(facing).coverDefinition;
var behaviour = coverDefinition.createCoverBehavior(coverContainer, getFrontFacing());
if (!behaviour.canAttach()) {
return false;
}
}
var blockState = getBlockState();
if (blockState.getBlock() instanceof MetaMachineBlock metaMachineBlock) {
return metaMachineBlock.rotationState.test(facing);
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/machine/TieredEnergyMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.gregtechceu.gtceu.api.machine.feature.IExplosionMachine;
import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine;
import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer;
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
import com.gregtechceu.gtceu.config.ConfigHolder;

import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
Expand All @@ -17,7 +18,11 @@
import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.Direction;
import net.minecraft.util.Mth;
import net.minecraftforge.items.IItemHandlerModifiable;

import org.jetbrains.annotations.Nullable;

import javax.annotation.ParametersAreNonnullByDefault;

Expand Down Expand Up @@ -80,6 +85,26 @@ public void onUnload() {
}
}

//////////////////////////////////////
// ****** Capability ********//
//////////////////////////////////////

@Override
public @Nullable IItemHandlerModifiable getItemHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getItemHandlerCap(side, useCoverCapability);
}

@Override
public @Nullable IFluidHandlerModifiable getFluidHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getFluidHandlerCap(side, useCoverCapability);
}

//////////////////////////////////////
// ******** Explosion ********//
//////////////////////////////////////
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine;
import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank;
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
import com.gregtechceu.gtceu.common.data.GTMaterials;

import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted;
import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.Direction;
import net.minecraftforge.items.IItemHandlerModifiable;

import lombok.Getter;
import org.jetbrains.annotations.Nullable;

import javax.annotation.ParametersAreNonnullByDefault;

Expand Down Expand Up @@ -53,4 +57,24 @@ public int getTier() {
}

protected abstract NotifiableFluidTank createSteamTank(Object... args);

//////////////////////////////////////
// ****** Capability ********//
//////////////////////////////////////

@Override
public @Nullable IItemHandlerModifiable getItemHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getItemHandlerCap(side, useCoverCapability);
}

@Override
public @Nullable IFluidHandlerModifiable getFluidHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getFluidHandlerCap(side, useCoverCapability);
}
}
21 changes: 21 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
import com.gregtechceu.gtceu.api.machine.trait.MachineTrait;
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler;
import com.gregtechceu.gtceu.utils.FormattingUtil;
import com.gregtechceu.gtceu.utils.GTMath;
Expand Down Expand Up @@ -171,6 +172,26 @@ public void loadCustomPersistedData(@NotNull CompoundTag tag) {
storedAmount = tag.getLong("storedAmount");
}

//////////////////////////////////////
// ****** Capability ********//
//////////////////////////////////////

@Override
public @Nullable IItemHandlerModifiable getItemHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getItemHandlerCap(side, useCoverCapability);
}

@Override
public @Nullable IFluidHandlerModifiable getFluidHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getFluidHandlerCap(side, useCoverCapability);
}

//////////////////////////////////////
// ******* Auto Output *******//
//////////////////////////////////////
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
import com.gregtechceu.gtceu.api.machine.trait.MachineTrait;
import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank;
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
import com.gregtechceu.gtceu.utils.FormattingUtil;
import com.gregtechceu.gtceu.utils.GTMath;
import com.gregtechceu.gtceu.utils.GTTransferUtils;
Expand Down Expand Up @@ -48,6 +49,7 @@
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandlerModifiable;

import com.mojang.blaze3d.MethodsReturnNonnullByDefault;
import lombok.Getter;
Expand Down Expand Up @@ -170,6 +172,26 @@ public void loadCustomPersistedData(@NotNull CompoundTag tag) {
if (storedAmount == 0 && !stored.isEmpty()) this.storedAmount = stored.getAmount();
}

//////////////////////////////////////
// ****** Capability ********//
//////////////////////////////////////

@Override
public @Nullable IItemHandlerModifiable getItemHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getItemHandlerCap(side, useCoverCapability);
}

@Override
public @Nullable IFluidHandlerModifiable getFluidHandlerCap(@Nullable Direction side, boolean useCoverCapability) {
if (side == getFrontFacing()) {
return null;
}
return super.getFluidHandlerCap(side, useCoverCapability);
}

//////////////////////////////////////
// ******* Auto Output *******//
//////////////////////////////////////
Expand Down