Forgot about tunnel rotation kek

Author: robotgryphon

src/main/java/dev/compactmods/machines/tunnel/TunnelHelper.java

@@ -1,8 +1,12 @@
 package dev.compactmods.machines.tunnel;
 
+import net.minecraft.core.Direction;
+
 import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
-import net.minecraft.core.Direction;
 
 public class TunnelHelper {
 
@@ -21,4 +25,12 @@ public static Direction getNextDirection(Direction in) {
     public static Stream<Direction> getOrderedSides() {
         return Stream.of(Direction.UP, Direction.DOWN, Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST);
     }
+
+    public static Optional<Direction> getNextDirection(Direction current, Set<Direction> used) {
+        final var ordered = getOrderedSides().toList();
+        final var found = ordered.indexOf(current);
+        final var stream = Stream.generate(() -> ordered).flatMap(Collection::stream);
+
+        return stream.skip(found + 1).filter(dir -> !used.contains(dir)).findFirst();
+    }
 }

src/main/java/dev/compactmods/machines/tunnel/TunnelWallBlock.java

@@ -144,36 +144,36 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
 
             try {
                 final var tunnelData = RoomTunnelData.get(serverLevel.getServer(), new ChunkPos(pos));
+                final var tunnelGraph = tunnelData.getGraph();
+                final var existingDirs = tunnelGraph
+                        .getTunnelSides(def)
+                        .collect(Collectors.toSet());
 
-                final var existingDirs = tunnelData.getGraph()
-                    .getTunnelSides(def)
-                    .collect(Collectors.toSet());
-
-                final Optional<Direction> firstNotFound = TunnelHelper.getOrderedSides()
-                        .filter(side -> !existingDirs.contains(side))
-                        .findFirst();
-
-                final var next = firstNotFound.orElse(dir);
-
-                if (next == dir) {
+                if (existingDirs.size() == 6) {
                     // WARN PLAYER - NO OTHER SIDES REMAIN
                     player.displayClientMessage(
                             TranslationUtil.message(Messages.NO_TUNNEL_SIDE).withStyle(ChatFormatting.DARK_RED), true);
 
                     return InteractionResult.FAIL;
                 }
 
-                level.setBlockAndUpdate(pos, state.setValue(CONNECTED_SIDE, next));
+                final var next = TunnelHelper.getNextDirection(dir, existingDirs);
+                next.ifPresent(newSide -> {
+                    level.setBlockAndUpdate(pos, state.setValue(CONNECTED_SIDE, newSide));
+
+                    if (def instanceof ITunnelTeardown teardown) {
+                        teardown.teardown(new TunnelPosition(serverLevel, pos, tunnelWallSide), tunnel.getTunnel(), TeardownReason.ROTATED);
+                    }
+
+                    var newTunn = def.newInstance(pos, newSide);
+                    tunnel.setTunnel(newTunn);
+
+                    tunnelGraph.rotateTunnel(pos, newSide);
+                    tunnelData.setDirty();
+                });
             } catch (MissingDimensionException e) {
                 return InteractionResult.FAIL;
             }
-
-            if (def instanceof ITunnelTeardown teardown) {
-                teardown.teardown(new TunnelPosition(serverLevel, pos, tunnelWallSide), tunnel.getTunnel(), TeardownReason.ROTATED);
-            }
-
-            var newTunn = def.newInstance(pos, tunnelWallSide);
-            tunnel.setTunnel(newTunn);
         }
 
         return InteractionResult.SUCCESS;

src/main/java/dev/compactmods/machines/tunnel/graph/TunnelConnectionGraph.java

@@ -510,4 +510,20 @@ private void cleanupOrphanedMachines() {
 
         removed.forEach(machines::remove);
     }
+
+    public void rotateTunnel(BlockPos tunnel, Direction newSide) {
+        if(!tunnels.containsKey(tunnel))
+            return;
+
+        final var connected = connectedMachine(tunnel);
+        connected.ifPresent(machine -> {
+            if(!machines.containsKey(machine))
+                return;
+
+            final var t = tunnels.get(tunnel);
+            final var m = machines.get(machine);
+            graph.removeEdge(t, m);
+            graph.putEdgeValue(t, m, new TunnelMachineEdge(newSide));
+        });
+    }
 }