Skip to content

Commit 75daa31

Browse files
authored
Fix Ender Redstone Link Covers on non-default channels (#3918)
Co-authored-by: jtuc <6748724+jtuc@users.noreply.github.com>
1 parent babadba commit 75daa31

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/main/java/com/gregtechceu/gtceu/api/misc/virtualregistry/entries/VirtualRedstone.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ public int getSignal() {
2424
return members.values().intStream().max().orElse(0);
2525
}
2626

27-
public UUID addMember() {
28-
UUID uuid = UUID.randomUUID();
27+
public void addMember(UUID uuid) {
2928
members.put(uuid, (short) 0);
30-
return uuid;
3129
}
3230

3331
public void setSignal(UUID uuid, int signal) {

src/main/java/com/gregtechceu/gtceu/common/cover/ender/EnderRedstoneLinkCover.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.gregtechceu.gtceu.api.capability.ICoverable;
44
import com.gregtechceu.gtceu.api.cover.CoverDefinition;
55
import com.gregtechceu.gtceu.api.misc.virtualregistry.EntryTypes;
6-
import com.gregtechceu.gtceu.api.misc.virtualregistry.VirtualEnderRegistry;
76
import com.gregtechceu.gtceu.api.misc.virtualregistry.VirtualEntry;
87
import com.gregtechceu.gtceu.api.misc.virtualregistry.entries.VirtualRedstone;
98

@@ -34,9 +33,8 @@ public class EnderRedstoneLinkCover extends AbstractEnderLinkCover<VirtualRedsto
3433
public EnderRedstoneLinkCover(CoverDefinition definition, ICoverable coverHolder, Direction attachedSide) {
3534
super(definition, coverHolder, attachedSide);
3635
if (!isRemote()) {
37-
storage = VirtualEnderRegistry.getInstance().getOrCreateEntry(getOwner(), EntryTypes.ENDER_REDSTONE,
38-
getChannelName());
39-
uuid = storage.addMember();
36+
uuid = UUID.randomUUID();
37+
setVirtualEntry();
4038
} else uuid = null;
4139
}
4240

@@ -57,7 +55,9 @@ protected VirtualRedstone getEntry() {
5755

5856
@Override
5957
protected void setEntry(VirtualEntry entry) {
58+
if (storage != null) storage.removeMember(uuid);
6059
storage = (VirtualRedstone) entry;
60+
storage.addMember(uuid);
6161
}
6262

6363
@Override

0 commit comments

Comments
 (0)