fix(energy net): update in tick

SlimefunGuguProject · Jan 30, 2024 · 62b7178 · 62b7178
1 parent 4f062e3
commit 62b7178
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java b/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java
@@ -179,7 +179,6 @@ public void removeBlock(Location l) {
         checkDestroy();
 
         var removed = getChunkDataCache(l.getChunk(), true).removeBlockData(l);
-        Slimefun.getNetworkManager().updateAllNetworks(l);
         if (removed == null) {
             return;
         }

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNet.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNet.java
@@ -162,15 +162,32 @@ public void tick(@Nonnull Block b) {
 
                 var data = StorageCacheUtils.getBlock(loc);
                 if (data == null || data.isPendingRemove()) {
+                    markDirty(loc);
                     continue;
                 }
 
+                EnergyNetComponent component = entry.getValue();
+                if (!((SlimefunItem) component).getId().equals(data.getSfId())) {
+                    var newItem = SlimefunItem.getById(data.getSfId());
+                    if (!(newItem instanceof EnergyNetComponent newComponent)) {
+                        markDirty(loc);
+                        continue;
+                    }
+
+                    if (newComponent.getEnergyComponentType() == EnergyNetComponentType.CONSUMER) {
+                        consumers.put(loc, newComponent);
+                        component = newComponent;
+                    } else {
+                        markDirty(loc);
+                        continue;
+                    }
+                }
+
                 if (!data.isDataLoaded()) {
                     StorageCacheUtils.requestLoad(data);
                     continue;
                 }
 
-                EnergyNetComponent component = entry.getValue();
                 int capacity = component.getCapacity();
                 int charge = component.getCharge(loc);
 
@@ -262,9 +279,21 @@ private int tickAllGenerators(@Nonnull LongConsumer timings) {
             try {
                 var data = StorageCacheUtils.getBlock(loc);
                 if (data == null || data.isPendingRemove()) {
+                    markDirty(loc);
                     continue;
                 }
 
+                if (!item.getId().equals(data.getSfId())) {
+                    var newItem = SlimefunItem.getById(data.getSfId());
+                    if (newItem instanceof EnergyNetProvider newProvider) {
+                        generators.put(loc, newProvider);
+                        provider = newProvider;
+                    } else {
+                        markDirty(loc);
+                        continue;
+                    }
+                }
+
                 if (!data.isDataLoaded()) {
                     StorageCacheUtils.requestLoad(data);
                     continue;