Fix broken digital singularities (#537)

Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Jul 30, 2024 · 7634deb · 7634deb
1 parent 0648d16
commit 7634deb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
@@ -989,6 +989,7 @@ public void getListOfItem(final IItemList<IAEItemStack> list, final CraftingItem
     }
 
     public void addStorage(final IAEItemStack extractItems) {
+        extractItems.setCraftable(false);
         this.inventory.injectItems(extractItems, Actionable.MODULATE, null);
     }
 
@@ -1121,6 +1122,10 @@ void done() {
     public void readFromNBT(final NBTTagCompound data) {
         this.finalOutput = AEItemStack.loadItemStackFromNBT((NBTTagCompound) data.getTag("finalOutput"));
         for (final IAEItemStack ais : this.readList((NBTTagList) data.getTag("inventory"))) {
+            if (ais.isCraftable() && ais.getStackSize() == 0) // remove bugged items from CPU Clusters, they are
+                                                              // spamming injectItems every tick
+                continue;
+            ais.setCraftable(false);
             this.inventory.injectItems(ais, Actionable.MODULATE, this.machineSrc);
         }
 

diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java
@@ -35,6 +35,7 @@
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.core.AELog;
 import appeng.util.IterationCounter;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
@@ -185,6 +186,13 @@ public IAEItemStack injectItems(final IAEItemStack input, final Actionable mode,
             }
         }
 
+        if (input.isCraftable()) {
+            AELog.error(
+                    new Throwable(),
+                    "FATAL: DETECTED ILLEGAL ITEM TO BE INSERTED ON STORAGE CELL, PLEASE REPORT ON GITHUB! STACKTRACE:");
+            input.setCraftable(false);
+        }
+
         final IAEItemStack l = this.getCellItems().findPrecise(input);
 
         if (l != null) {
@@ -391,6 +399,11 @@ private void loadCellItems() {
                 }
             }
         }
+
+        if (this.cellItems.size() != types) {
+            // fix broken singularity cells
+            this.saveChanges();
+        }
     }
 
     @Override