Fixed pipe issue with multiple machines at same pipe segment

Rearth · Apr 2, 2024 · 0e3f58c · 0e3f58c
1 parent d2d92fe
commit 0e3f58c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/rearth/oritech/block/blocks/pipes/GenericPipeConnectionBlock.java b/src/main/java/rearth/oritech/block/blocks/pipes/GenericPipeConnectionBlock.java
@@ -92,6 +92,11 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio
             return normalPipeState;
         }
 
+        if (!interfaceState.equals(state)) {
+            // reload connection when state has changed (e.g. machine added/removed)
+            GenericPipeInterfaceEntity.addNode(pos, true, interfaceState, getNetworkData((World) world));
+        }
+
         return interfaceState;
     }
 

diff --git a/src/main/java/rearth/oritech/block/entity/pipes/GenericPipeInterfaceEntity.java b/src/main/java/rearth/oritech/block/entity/pipes/GenericPipeInterfaceEntity.java
@@ -27,11 +27,11 @@ public GenericPipeInterfaceEntity(BlockEntityType<?> type, BlockPos pos, BlockSt
     }
 
     public static void addNode(BlockPos pos, boolean isInterface, BlockState newState, PipeNetworkData data) {
-        System.out.println("registering node: " + pos);
+        System.out.println("registering/updating node: " + pos);
 
         data.pipes.add(pos);
         if (isInterface) {
-            var connectedMachines = new HashSet<BlockPos>(1);
+            var connectedMachines = new HashSet<BlockPos>(6);
             if (newState.get(GenericPipeConnectionBlock.INTERFACE_NORTH))
                 connectedMachines.add(pos.north());
             if (newState.get(GenericPipeConnectionBlock.INTERFACE_SOUTH))
@@ -45,9 +45,9 @@ public static void addNode(BlockPos pos, boolean isInterface, BlockState newStat
             if (newState.get(GenericPipeConnectionBlock.INTERFACE_DOWN))
                 connectedMachines.add(pos.down());
 
-            System.out.println(connectedMachines);
-
             data.machineInterfaces.put(pos, connectedMachines);
+        } else {
+            data.machineInterfaces.remove(pos);
         }
 
         updateFromNode(pos, data);
@@ -88,8 +88,9 @@ private static void updateFromNode(BlockPos pos, PipeNetworkData data) {
         var searchInstance = new FloodFillSearch(pos, data.pipes);
         var foundNetwork = new HashSet<>(searchInstance.complete());
         var foundMachines = findConnectedMachines(foundNetwork, data);
+
         System.out.println("Nodes:    " + foundNetwork.size() + " | " + foundNetwork);
-        System.out.println("Machines: " + foundMachines.size() + " | " + foundMachines);
+        System.out.println("Machines: " + foundMachines.size() + " | " + foundMachines.stream().map(elem -> elem.getLeft() + ":" + elem.getRight()).toList());
 
         var netID = foundNetwork.hashCode();
         data.pipeNetworks.put(netID, foundNetwork);
@@ -109,8 +110,6 @@ private static void updateFromNode(BlockPos pos, PipeNetworkData data) {
         });
 
         data.markDirty();
-
-        System.out.println("Total Networks: " + data.pipeNetworks.keySet().size());
     }
 
     private static Set<Pair<BlockPos, Direction>> findConnectedMachines(Set<BlockPos> network, PipeNetworkData data) {