[WIP]: fix grid chunk loading and unloading

Author: falseresync

src/main/java/falseresync/vivatech/common/Vivatech.java

@@ -82,6 +82,10 @@ public void onInitialize() {
             serverGridsLoader.close();
         });
 
+        ServerLifecycleEvents.AFTER_SAVE.register((server, flush, force) -> {
+            serverGridsLoader.save();
+        });
+
         ServerTickEvents.END_WORLD_TICK.register(world -> {
             serverGridsLoader.tick(world);
         });

src/main/java/falseresync/vivatech/common/power/Grid.java

@@ -1,6 +1,5 @@
 package falseresync.vivatech.common.power;
 
-import falseresync.vivatech.common.VivatechUtil;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import net.minecraft.block.AbstractFireBlock;
@@ -27,7 +26,6 @@ public class Grid {
     private final SimpleGraph<GridVertex, GridEdge> graph;
     private final Map<BlockPos, Appliance> appliances;
     private final Map<ChunkPos, Set<BlockPos>> trackedChunks;
-    private final Set<ChunkPos> unloadedChunks;
     private final GridsManager gridsManager;
     private final ServerWorld world;
     private final WireType wireType;
@@ -43,7 +41,6 @@ public Grid(GridsManager gridsManager, ServerWorld world, WireType wireType) {
         graph = new SimpleGraph<>(GridEdge.class);
         appliances = new Object2ReferenceRBTreeMap<>();
         trackedChunks = PowerSystem.createChunkPosKeyedMap();
-        unloadedChunks = PowerSystem.createChunkPosSet();
     }
 
     public Grid(GridsManager gridsManager, ServerWorld world, WireType wireType, Set<GridEdge> edges) {
@@ -92,7 +89,7 @@ private void initOrMerge(GridVertex vertex) {
         var otherGrid = gridsManager.getGridLookup().get(vertex.pos());
         if (otherGrid == null) {
             graph.addVertex(vertex);
-            onVertexAdded(vertex, false);
+            onVertexAdded(vertex, true);
         } else if (otherGrid != this) {
             merge(otherGrid.graph);
             gridsManager.getGrids().remove(otherGrid);
@@ -102,7 +99,7 @@ private void initOrMerge(GridVertex vertex) {
     private void merge(Graph<GridVertex, GridEdge> otherGraph) {
         Graphs.addGraph(this.graph, otherGraph);
         for (var vertex : otherGraph.vertexSet()) {
-            onVertexAdded(vertex, true);
+            onVertexAdded(vertex, false);
         }
     }
 
@@ -149,26 +146,17 @@ private void partition() {
             } else {
                 var other = gridsManager.create(wireType);
                 other.merge(isolatedGraph);
-                var iterator = unloadedChunks.iterator();
-                while (iterator.hasNext()) {
-                    var chunkPos = iterator.next();
-                    if (other.tracksChunk(chunkPos)) {
-                        other.unloadedChunks.add(chunkPos);
-                        other.frozen = true;
-                        iterator.remove();
-                    }
-                }
             }
         }
 
         gridsManager.getGrids().remove(this);
     }
 
-    private void onVertexAdded(GridVertex vertex, boolean transferred) {
+    private void onVertexAdded(GridVertex vertex, boolean shouldInitialize) {
         gridsManager.getGridLookup().put(vertex.pos(), this);
         if (vertex.appliance() != null) {
             if (!appliances.containsValue(vertex.appliance())) {
-                onApplianceAdded(vertex.appliance(), transferred);
+                onApplianceAdded(vertex.appliance(), shouldInitialize);
                 var appliancePos = vertex.appliance().getPos();
                 trackedChunks.computeIfAbsent(new ChunkPos(appliancePos), key -> new ObjectOpenHashSet<>()).add(appliancePos);
             }
@@ -177,7 +165,7 @@ private void onVertexAdded(GridVertex vertex, boolean transferred) {
 
     private void onApplianceAdded(Appliance appliance, boolean shouldInitialize) {
         appliances.put(appliance.getPos(), appliance);
-        if (!shouldInitialize) {
+        if (shouldInitialize) {
             appliance.onGridConnected();
         }
     }
@@ -225,42 +213,22 @@ private void onWireRemoved(GridEdge edge) {
         serverWire.drop(world, wireType);
     }
 
-    public boolean isFrozen() {
-        return frozen;
-    }
-
-    public boolean tracksChunk(ChunkPos chunkPos) {
-        return trackedChunks.containsKey(chunkPos);
-    }
-
-    public void onChunkLoaded(ChunkPos chunkPos) {
-        unloadedChunks.remove(chunkPos);
-        if (frozen && unloadedChunks.isEmpty()) {
-            frozen = false;
-            refreshApplianceReferences();
-            appliances.values().forEach(Appliance::onGridUnfrozen);
-        }
-    }
-
-    private void refreshApplianceReferences() {
-        for (GridVertex oldVertex : graph.vertexSet()) {
-            if (oldVertex.appliance() != null) {
-                var appliance = PowerSystem.APPLIANCE.find(world, oldVertex.appliance().getPos(), null);
-                VivatechUtil.replaceVertexUndirected(graph, oldVertex, new GridVertex(oldVertex.pos(), appliance));
-                onApplianceAdded(appliance, true);
+    private void checkIfFrozen() {
+        for (ChunkPos chunkPos : trackedChunks.keySet()) {
+            if (!world.shouldTickBlocksInChunk(chunkPos.toLong())) {
+                frozen = true;
+                return;
             }
         }
+        frozen = false;
     }
 
-    public void onChunkUnloaded(ChunkPos chunkPos) {
-        unloadedChunks.add(chunkPos);
-        if (!frozen) {
-            frozen = true;
-            appliances.values().forEach(Appliance::onGridFrozen);
+    public void tick() {
+        checkIfFrozen();
+        if (frozen) {
+            return;
         }
-    }
 
-    public void tick() {
         float generation = 0;
         float consumption = 0;
         for (var appliance : appliances.values()) {

src/main/java/falseresync/vivatech/common/power/GridsManager.java

@@ -42,9 +42,7 @@ public GridsManager(ServerWorld world) {
 
     public void tick() {
         for (Grid grid : grids) {
-            if (!grid.isFrozen()) {
-                grid.tick();
-            }
+            grid.tick();
         }
     }
 

src/main/java/falseresync/vivatech/common/power/ServerGridsLoader.java

@@ -1,8 +1,6 @@
 package falseresync.vivatech.common.power;
 
-import falseresync.vivatech.common.VivatechUtil;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtOps;
@@ -28,24 +26,6 @@ public class ServerGridsLoader {
 
     public ServerGridsLoader(MinecraftServer server) {
         this.server = server;
-
-        VivatechUtil.CHUNK_STOP_TICKING.register((world, chunkPos) -> {
-            for (var grid : getGridsManager(world).getGrids()) {
-                if (grid.tracksChunk(chunkPos)) {
-                    grid.onChunkUnloaded(chunkPos);
-                }
-            }
-        });
-
-        VivatechUtil.CHUNK_START_TICKING.register((world, chunkPos) -> {
-            for (var grid : getGridsManager(world).getGrids()) {
-                if (grid.tracksChunk(chunkPos)) {
-                    grid.onChunkLoaded(chunkPos);
-                }
-            }
-        });
-
-        ServerLifecycleEvents.AFTER_SAVE.register((_ignored, flush, force) -> save());
         load();
     }