Skip to content

fix: check canConnect when trying to connect to another pipe #82

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

Open
sevenc-nanashi wants to merge 1 commit into
base: 0.11.x-1.20.x
Choose a base branch
from
Open

fix: check canConnect when trying to connect to another pipe #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions src/main/java/alexiil/mc/mod/pipes/pipe/PartSpPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public class PartSpPipe extends AbstractPart implements ISimplePipe {
ID_FLOW = NET_PARENT.idData("flow").toClientOnly();
ID_FLOW.setReceiver(PartSpPipe::receiveFlow);
}

public static void load() {
// force the static initializer to run
}
Expand Down Expand Up @@ -174,18 +174,16 @@ public ItemStack getPickStack(@Nullable BlockHitResult hitResult) {
@Environment(EnvType.CLIENT)
protected void spawnBreakParticles() {
spawnBreakParticles(
Blocks.STONE.getDefaultState(),
PipeBaseModelGenStandard.getCenterSprite(SpriteSupplier.NO_CONTEXT_SUPPLIER, definition)
);
Blocks.STONE.getDefaultState(),
PipeBaseModelGenStandard.getCenterSprite(SpriteSupplier.NO_CONTEXT_SUPPLIER, definition));
}

@Override
@Environment(EnvType.CLIENT)
public boolean spawnHitParticle(Direction side) {
spawnHitParticle(
side, Blocks.STONE.getDefaultState(),
PipeBaseModelGenStandard.getCenterSprite(SpriteSupplier.NO_CONTEXT_SUPPLIER, definition)
);
side, Blocks.STONE.getDefaultState(),
PipeBaseModelGenStandard.getCenterSprite(SpriteSupplier.NO_CONTEXT_SUPPLIER, definition));
return true;
}

Expand All @@ -200,10 +198,8 @@ public void addAllAttributes(AttributeList<?> list) {
}
VoxelShape pipeShape = isConnected(pipeSide) ? FACE_CENTER_SHAPES[pipeSide.ordinal()] : CENTER_SHAPE;

if (
definition.isExtraction && behaviour instanceof PipeSpBehaviourSided
&& ((PipeSpBehaviourSided) behaviour).currentDirection() == pipeSide
) {
if (definition.isExtraction && behaviour instanceof PipeSpBehaviourSided
&& ((PipeSpBehaviourSided) behaviour).currentDirection() == pipeSide) {
list.offer(getFlow().getInsertable(list.getSearchDirection()), pipeShape);
} else {
list.offer(definition.getEmptyExtractable(), pipeShape);
Expand Down Expand Up @@ -241,7 +237,10 @@ private void updateConnections() {
if (definition.isExtraction && oPipe != null && oPipe.getDefinition().isExtraction) {
disconnect(dir);
} else if (oPipe != null) {
if ((getFlow() instanceof PipeSpFlowItem) == (oPipe.getFlow() instanceof PipeSpFlowItem)) {
if ((getFlow() instanceof PipeSpFlowItem) == (oPipe.getFlow() instanceof PipeSpFlowItem) &&
canConnect(dir) &&
(!(oPipe instanceof PartSpPipe)
|| ((PartSpPipe) oPipe).canConnect(dir.getOpposite()))) {
connect(dir);
} else {
disconnect(dir);
Expand Down Expand Up @@ -361,7 +360,8 @@ private void transformConnections(DirectionTransformation transform) {

public void refreshModel() {
if (holder.getContainer().isClientWorld()) {
// This can be called on the server too, but this way everything's done with a single packet
// This can be called on the server too, but this way everything's done with a
// single packet
redrawIfChanged();
} else {
sendNetworkUpdate(this, NET_RENDER_DATA);
Expand Down