Skip to content

Fixed factory gauge unlinking from display links when moved #10168

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
LIUKRAST wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
+8 −1
Open

Fixed factory gauge unlinking from display links when moved #10168

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
9 changes: 8 additions & 1 deletion src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import java.util.Set;
import java.util.UUID;

import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.joml.Math;
Expand Down Expand Up @@ -215,11 +217,15 @@ public void moveTo(FactoryPanelPosition newPos, ServerPlayer player) {
return;

// Disconnect links
Map<BlockPos, FactoryPanelConnection> displayLinks = new HashMap<>();
for (BlockPos pos : targetedByLinks.keySet()) {
FactoryPanelSupportBehaviour at = linkAt(level, new FactoryPanelPosition(pos, slot));
if (at != null)
if (at != null) {
at.disconnect(this);
if(at.blockEntity instanceof DisplayLinkBlockEntity) displayLinks.put(pos, targetedByLinks.get(pos));
}
}
displayLinks.keySet().forEach(key -> targetedByLinks.remove(key));

SmartBlockEntity oldBE = blockEntity;
FactoryPanelPosition oldPos = getPanelPosition();
Expand Down Expand Up @@ -264,6 +270,7 @@ public void moveTo(FactoryPanelPosition newPos, ServerPlayer player) {
}

// Reconnect links
targetedByLinks.putAll(displayLinks);
for (BlockPos pos : targetedByLinks.keySet()) {
FactoryPanelSupportBehaviour at = linkAt(level, new FactoryPanelPosition(pos, slot));
if (at != null)
Expand Down