Merge branch 'refs/heads/dev/1.19.2' into dev/1.20.1

# Conflicts: # CHANGELOG.md # build.gradle # settings.gradle # src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java
IntelligenceModding · Apr 11, 2024 · dedbe13 · dedbe13
2 parents 4036e91 + 33c4681
commit dedbe13
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java b/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java
@@ -340,6 +340,10 @@ public static long getTotalItemStorage(IGridNode node) {
                     if (storageCell.getKeyType() != AEKeyType.items())
                         continue;
                     total += storageCell.getKiloBytes() * 1024L;
+                } else if (APAddons.aeAdditionsLoaded && (stack.getItem() instanceof StorageCell storageCell)) {
+                    if (storageCell.getKeyType() != AEKeyType.items())
+                        continue;
+                    total += storageCell.getKiloBytes() * 1024;
                 }
             }
         }
@@ -391,6 +395,10 @@ public static long getTotalFluidStorage(IGridNode node) {
                     if (storageCell.getKeyType() != AEKeyType.fluids())
                         continue;
                     total += storageCell.getKiloBytes() * 1024L;
+                } else if (APAddons.aeAdditionsLoaded && (stack.getItem() instanceof StorageCell storageCell)) {
+                    if (storageCell.getKeyType() != AEKeyType.fluids())
+                        continue;
+                    total += storageCell.getKiloBytes() * 1024;
                 }
             }
         }