Fix DualSignalReceiver aspect updates

railcraft-reborn · Dec 17, 2023 · c406cf3 · c406cf3
1 parent 3532823
commit c406cf3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/api/java/mods/railcraft/api/signal/DualSignalReceiver.java b/src/api/java/mods/railcraft/api/signal/DualSignalReceiver.java
@@ -53,6 +53,16 @@ public void unlinked(SignalController signalController) {
     }
   }
 
+  @Override
+  public void receiveSignalAspect(SignalController signalController,
+      SignalAspect signalAspect) {
+    if (signalController == this.primarySignalClient.getSignalController()) {
+      super.receiveSignalAspect(signalController, signalAspect);
+    } else if (signalController == this.secondarySignalClient.getSignalController()) {
+      this.secondarySignalClient.setSignalAspect(signalAspect);
+    }
+  }
+
   @Override
   public void refresh() {
     super.refresh();

diff --git a/src/api/java/mods/railcraft/api/signal/SignalNetwork.java b/src/api/java/mods/railcraft/api/signal/SignalNetwork.java
@@ -40,7 +40,7 @@ public interface SignalNetwork<T> {
   default Stream<T> stream() {
     return this.peers().stream()
         .map(this::peerAt)
-        .flatMap(optional -> optional.isPresent() ? Stream.of(optional.get()) : Stream.empty());
+        .flatMap(Optional::stream);
   }
 
   default int peerCount() {

diff --git a/...ain/java/mods/railcraft/world/level/block/entity/signal/DualDistantSignalBlockEntity.java b/...ain/java/mods/railcraft/world/level/block/entity/signal/DualDistantSignalBlockEntity.java
@@ -2,7 +2,7 @@
 
 import mods.railcraft.api.signal.DualSignalReceiver;
 import mods.railcraft.api.signal.SignalAspect;
-import mods.railcraft.api.signal.SingleSignalReceiver;
+import mods.railcraft.api.signal.SignalReceiver;
 import mods.railcraft.api.signal.entity.SignalReceiverEntity;
 import mods.railcraft.world.level.block.entity.RailcraftBlockEntityTypes;
 import net.minecraft.core.BlockPos;
@@ -52,7 +52,7 @@ public SignalAspect getSecondarySignalAspect() {
   }
 
   @Override
-  public SingleSignalReceiver getSignalReceiver() {
+  public SignalReceiver getSignalReceiver() {
     return this.signalReceiver;
   }