Tunnel graph operational and tested

Author: robotgryphon

src/api/java/dev/compactmods/machines/api/room/MachineRoomConnections.java

@@ -19,4 +19,6 @@ public interface MachineRoomConnections {
     void connectMachineToRoom(int machine, ChunkPos room);
 
     void disconnect(int machine);
+
+    void unregisterRoom(ChunkPos room);
 }

src/api/java/dev/compactmods/machines/api/tunnels/capability/ITunnelCapabilityProvider.java

@@ -8,7 +8,7 @@
 
 public interface ITunnelCapabilityProvider<Tunnel extends ITunnel> {
 
-    ImmutableSet<Class> getSupportedCapabilities(Tunnel instance);
+    ImmutableSet<Class> getSupportedCapabilities();
 
     /**
      * Fetch a capability instance from a tunnel.

src/main/java/dev/compactmods/machines/graph/CompactMachineConnectionGraph.java

@@ -5,8 +5,10 @@
 import com.google.common.graph.ValueGraphBuilder;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.codec.CodecExtensions;
 import dev.compactmods.machines.machine.graph.CompactMachineNode;
+import dev.compactmods.machines.room.exceptions.NonexistentRoomException;
 import dev.compactmods.machines.room.graph.CompactMachineRoomNode;
 import net.minecraft.world.level.ChunkPos;
 
@@ -56,9 +58,13 @@ private CompactMachineConnectionGraph(List<CompactMachineConnectionInfo> connect
     private List<CompactMachineConnectionInfo> buildConnections() {
         List<CompactMachineConnectionInfo> result = new ArrayList<>();
         this.rooms.forEach((chunk, node) -> {
-            Collection<Integer> machines = this.getMachinesFor(chunk);
-            CompactMachineConnectionInfo roomInfo = new CompactMachineConnectionInfo(chunk, machines);
-            result.add(roomInfo);
+            try {
+                Collection<Integer> machines = this.getMachinesFor(chunk);
+                CompactMachineConnectionInfo roomInfo = new CompactMachineConnectionInfo(chunk, machines);
+                result.add(roomInfo);
+            } catch (NonexistentRoomException e) {
+                CompactMachines.LOGGER.error(e);
+            }
         });
 
         return result;
@@ -95,10 +101,10 @@ public void connectMachineToRoom(int machine, ChunkPos room) {
         graph.putEdgeValue(machineNode, roomNode, DefaultEdges.machineToRoom());
     }
 
-    public Collection<Integer> getMachinesFor(ChunkPos machineChunk) {
+    public Collection<Integer> getMachinesFor(ChunkPos machineChunk) throws NonexistentRoomException {
         var node = this.rooms.get(machineChunk);
         if(node == null)
-            return Collections.emptySet();
+            throw new NonexistentRoomException(machineChunk);
 
         var inbound = graph.predecessors(node);
         return inbound.stream()
@@ -134,6 +140,14 @@ public void disconnectAndUnregister(int machine) {
         machines.remove(machine);
     }
 
+    public void removeRoom(ChunkPos room) {
+        if(!this.rooms.containsKey(room))
+            return;
+
+        graph.removeNode(rooms.get(room));
+        rooms.remove(room);
+    }
+
     /**
      * Data structure for serialization. Do not use directly.
      */

src/main/java/dev/compactmods/machines/machine/Machines.java

@@ -34,8 +34,8 @@ public static int createNew(MinecraftServer server, Level level, BlockPos machin
         }
 
         int nextId = machines.getNextMachineId();
-        connections.registerMachine(nextId);
         machines.setMachineLocation(nextId, new DimensionalPosition(level.dimension(), machinePos));
+        connections.registerMachine(nextId);
         return nextId;
     }
 

src/main/java/dev/compactmods/machines/machine/data/CompactMachineData.java

@@ -135,7 +135,7 @@ public Stream<MachineData> stream() {
     }
 
     public int getNextMachineId() {
-        return data.size() + 1;
+        return data.size() + 2;
     }
 
     public static class MachineData {

src/main/java/dev/compactmods/machines/machine/data/MachineToRoomConnections.java

@@ -4,6 +4,7 @@
 import dev.compactmods.machines.api.room.MachineRoomConnections;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.graph.CompactMachineConnectionGraph;
+import dev.compactmods.machines.room.exceptions.NonexistentRoomException;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.server.MinecraftServer;
@@ -14,6 +15,7 @@
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Optional;
 
 public class MachineToRoomConnections extends SavedData implements MachineRoomConnections {
@@ -36,7 +38,7 @@ public static MachineRoomConnections get(MinecraftServer server) {
         return sd.computeIfAbsent(MachineToRoomConnections::fromNbt, MachineToRoomConnections::new, DATA_NAME);
     }
 
-    public static MachineToRoomConnections fromNbt(CompoundTag nbt) {
+    static MachineToRoomConnections fromNbt(CompoundTag nbt) {
         MachineToRoomConnections c = new MachineToRoomConnections();
         if (nbt.contains("graph")) {
             CompoundTag graphNbt = nbt.getCompound("graph");
@@ -59,18 +61,38 @@ public CompoundTag save(@Nonnull CompoundTag nbt) {
         return nbt;
     }
 
+    /**
+     * @deprecated Integer machines are planned to be removed in 1.19; plan is to replace them with dimensional positions
+     * @param machineId
+     * @return
+     */
     @Override
     @Nonnull
     public Optional<ChunkPos> getConnectedRoom(int machineId) {
         return graph.getConnectedRoom(machineId);
     }
 
+    /**
+     * @param chunkPos Room to get machine IDs for
+     * @return
+     * @deprecated Integer machines are planned to be removed in 1.19; plan is to replace them with dimensional positions
+     */
     @Override
     @Nonnull
+    @Deprecated(since = "1.7.0")
     public Collection<Integer> getMachinesFor(ChunkPos chunkPos) {
-        return graph.getMachinesFor(chunkPos);
+        try {
+            return graph.getMachinesFor(chunkPos);
+        } catch (NonexistentRoomException e) {
+            CompactMachines.LOGGER.error("Tried to get machine info for nonexistent room: " + chunkPos, e);
+            return Collections.emptySet();
+        }
     }
 
+    /**
+     * @deprecated Integer machines are planned to be removed in 1.19; plan is to replace them with dimensional positions
+     * @param machine
+     */
     @Override
     public void registerMachine(int machine) {
         graph.addMachine(machine);
@@ -83,12 +105,27 @@ public void registerRoom(ChunkPos roomChunk) {
         setDirty();
     }
 
+    @Override
+    public void unregisterRoom(ChunkPos roomChunk) {
+        graph.removeRoom(roomChunk);
+        setDirty();
+    }
+
+    /**
+     * @deprecated Integer machines are planned to be removed in 1.19; plan is to replace them with dimensional positions
+     * @param machine
+     * @param room
+     */
     @Override
     public void connectMachineToRoom(int machine, ChunkPos room) {
         graph.connectMachineToRoom(machine, room);
         setDirty();
     }
 
+    /**
+     * @deprecated Integer machines are planned to be removed in 1.19; plan is to replace them with dimensional positions
+     * @param machine
+     */
     @Override
     public void disconnect(int machine) {
         graph.disconnectAndUnregister(machine);

src/main/java/dev/compactmods/machines/room/Rooms.java

@@ -104,6 +104,8 @@ public static boolean destroy(MinecraftServer server, ChunkPos room) throws Miss
         for(int mid : connected) {
             d.getMachineLocation(mid);
         }
+
+        conns.unregisterRoom(room);
         return true;
     }
 }

src/main/java/dev/compactmods/machines/tunnel/definitions/ItemTunnel.java

@@ -41,7 +41,7 @@ public ITunnel newInstance(BlockPos pos, Direction side) {
     }
 
     @Override
-    public ImmutableSet<Class> getSupportedCapabilities(ItemStorage instance) {
+    public ImmutableSet<Class> getSupportedCapabilities() {
         return ImmutableSet.<Class>builder()
                 .add(IItemHandler.class)
                 .build();