From 80efc00cb1044878d4ef324eddef4d15e9d061e6 Mon Sep 17 00:00:00 2001
From: lc-1337 <lordicocain@gmail.com>
Date: Mon, 22 Jun 2026 23:47:37 +0300
Subject: [PATCH] use IStorageCell

---
 .../container/ContainerSuperStockReplenisher.java | 15 +++------------
 .../common/tile/TileSuperStockReplenisher.java    |  9 ++-------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java
index d5809fc24..206af891e 100644
--- a/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java
+++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java
@@ -12,13 +12,13 @@
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.GuiFCImgButton;
-import com.glodblock.github.common.item.FCBaseItemCell;
 import com.glodblock.github.common.tile.TileSuperStockReplenisher;
 import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.network.SPacketSuperStockReplenisherUpdate;
 import com.glodblock.github.util.FluidPrimaryGui;
 
+import appeng.api.implementations.items.IStorageCell;
 import appeng.api.storage.StorageName;
 import appeng.api.storage.data.IAEStack;
 import appeng.container.AEBaseContainer;
@@ -29,7 +29,6 @@
 import appeng.container.sync.SyncManager;
 import appeng.container.sync.handlers.AEStackInventorySyncHandler;
 import appeng.container.sync.handlers.BooleanSyncHandler;
-import appeng.items.storage.ItemBasicStorageCell;
 import appeng.tile.inventory.IAEStackInventory;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
@@ -137,17 +136,9 @@ public boolean isValidForSlot(Slot s, ItemStack is) {
             long currentBytes = 0;
             long newBytes = -1;
 
-            if (s.getStack().getItem() instanceof ItemBasicStorageCell ibsc) {
-                currentBytes = ibsc.getBytesLong(is);
-            } else if (s.getStack().getItem() instanceof FCBaseItemCell fcbic) {
-                currentBytes = fcbic.getBytes(is);
-            }
+            if (s.getStack().getItem() instanceof IStorageCell isc) currentBytes = isc.getBytesLong(is);
 
-            if (is.getItem() instanceof ItemBasicStorageCell ibsc) {
-                newBytes = ibsc.getBytesLong(is);
-            } else if (is.getItem() instanceof FCBaseItemCell fcbic) {
-                newBytes = fcbic.getBytes(is);
-            }
+            if (is.getItem() instanceof IStorageCell isc) newBytes = isc.getBytesLong(is);
 
             if (currentBytes > newBytes) {
                 return false;
diff --git a/src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java b/src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java
index a018a0850..02ca54bb4 100644
--- a/src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java
+++ b/src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java
@@ -17,7 +17,6 @@
 
 import org.jetbrains.annotations.Nullable;
 
-import com.glodblock.github.common.item.FCBaseItemCell;
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.glodblock.github.inventory.AEFluidInventory;
 import com.glodblock.github.inventory.IAEFluidInventory;
@@ -28,6 +27,7 @@
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
 import appeng.api.implementations.IPowerChannelState;
+import appeng.api.implementations.items.IStorageCell;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.events.MENetworkBootingStatusChange;
@@ -48,7 +48,6 @@
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
 import appeng.core.AELog;
-import appeng.items.storage.ItemBasicStorageCell;
 import appeng.me.GridAccessException;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
@@ -488,11 +487,7 @@ public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemSta
             case setInventorySlotContents -> {
                 if (inv == cell) {
                     if (added != null) {
-                        if (added.getItem() instanceof ItemBasicStorageCell ibsc) {
-                            totalBytes = ibsc.getBytesLong(added);
-                        } else if (added.getItem() instanceof FCBaseItemCell fcbic) {
-                            totalBytes = fcbic.getBytes(added);
-                        }
+                        if (added.getItem() instanceof IStorageCell isc) totalBytes = isc.getBytesLong(added);
                         getProxy().setIdlePowerUsage(Math.sqrt(Math.pow(totalBytes, 0.576D)));
                     } else if (removed != null) {
                         totalBytes = 0;