[#539] Remove the external storage counters from the internal functions

Author: SirEndii

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java

@@ -34,6 +34,7 @@
 import me.ramidzkh.mekae2.ae2.MekanismKey;
 import me.ramidzkh.mekae2.ae2.MekanismKeyType;
 import me.ramidzkh.mekae2.item.ChemicalStorageCell;
+import mekanism.api.chemical.merged.MergedChemicalTank;
 import mekanism.common.tile.TileEntityChemicalTank;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
@@ -479,7 +480,8 @@ public static long getTotalExternalChemicalStorage(IGridNode node) {
                 continue;
 
             if (connectedInventoryEntity instanceof TileEntityChemicalTank tank) {
-                total += tank.getChemicalTank().getTankFromCurrent(tank.getChemicalTank().getCurrent()).getCapacity();
+                MergedChemicalTank.Current current = tank.getChemicalTank().getCurrent() == MergedChemicalTank.Current.EMPTY ? MergedChemicalTank.Current.GAS : tank.getChemicalTank().getCurrent();
+                total += tank.getChemicalTank().getTankFromCurrent(current).getCapacity();
             }
         }
 
@@ -496,9 +498,8 @@ public static long getUsedExternalItemStorage(IGridNode node) {
             KeyCounter keyCounter = bus.getInternalHandler().getAvailableStacks();
 
             for (Object2LongMap.Entry<AEKey> aeKey : keyCounter) {
-                if (aeKey.getKey() instanceof AEItemKey) {
+                if (aeKey.getKey() instanceof AEItemKey)
                     used += aeKey.getLongValue();
-                }
             }
         }
 
@@ -513,9 +514,8 @@ public static long getUsedExternalFluidStorage(IGridNode node) {
             KeyCounter keyCounter = bus.getInternalHandler().getAvailableStacks();
 
             for (Object2LongMap.Entry<AEKey> aeKey : keyCounter) {
-                if (aeKey.getKey() instanceof AEFluidKey) {
+                if (aeKey.getKey() instanceof AEFluidKey)
                     used += aeKey.getLongValue();
-                }
             }
         }
 
@@ -525,14 +525,16 @@ public static long getUsedExternalFluidStorage(IGridNode node) {
     public static long getUsedExternalChemicalStorage(IGridNode node) {
         long used = 0;
 
+        if (!APAddons.appMekLoaded)
+            return 0;
+
         for (IGridNode iGridNode : node.getGrid().getMachineNodes(StorageBusPart.class)) {
             StorageBusPart bus = (StorageBusPart) iGridNode.getService(IStorageProvider.class);
             KeyCounter keyCounter = bus.getInternalHandler().getAvailableStacks();
 
             for (Object2LongMap.Entry<AEKey> aeKey : keyCounter) {
-                if (aeKey.getKey() instanceof MekanismKey) {
+                if (aeKey.getKey() instanceof MekanismKey)
                     used += aeKey.getLongValue();
-                }
             }
         }
 
@@ -571,9 +573,6 @@ public static long getTotalItemStorage(IGridNode node) {
                 }
             }
         }
-
-        total += getTotalExternalItemStorage(node);
-
         return total;
     }
 
@@ -603,14 +602,15 @@ public static long getTotalFluidStorage(IGridNode node) {
             }
         }
 
-        total += getTotalExternalFluidStorage(node);
-
         return total;
     }
 
     public static long getTotalChemicalStorage(IGridNode node) {
         long total = 0;
 
+        if (!APAddons.appMekLoaded)
+            return 0;
+
         for (IGridNode iGridNode : node.getGrid().getMachineNodes(DriveBlockEntity.class)) {
             DriveBlockEntity entity = (DriveBlockEntity) iGridNode.getService(IStorageProvider.class);
             if (entity == null)
@@ -626,14 +626,12 @@ public static long getTotalChemicalStorage(IGridNode node) {
 
                 if (stack.getItem() instanceof ChemicalStorageCell cell) {
                     if (cell.getKeyType() instanceof MekanismKeyType) {
-                        total += (long) cell.getBytes(null) * MekanismKeyType.TYPE.getAmountPerByte();
+                        total += cell.getBytes(null);
                     }
                 }
             }
         }
 
-        total += getTotalExternalChemicalStorage(node);
-
         return total;
     }
 
@@ -683,8 +681,6 @@ public static long getUsedItemStorage(IGridNode node) {
             }
         }
 
-        used += getUsedExternalItemStorage(node);
-
         return used;
     }
 
@@ -722,14 +718,15 @@ public static long getUsedFluidStorage(IGridNode node) {
             }
         }
 
-        used += getUsedExternalFluidStorage(node);
-
         return used;
     }
 
     public static long getUsedChemicalStorage(IGridNode node) {
         long used = 0;
 
+        if (!APAddons.appMekLoaded)
+            return 0;
+
         for (IGridNode iGridNode : node.getGrid().getMachineNodes(DriveBlockEntity.class)) {
             DriveBlockEntity entity = (DriveBlockEntity) iGridNode.getService(IStorageProvider.class);
             if (entity == null)
@@ -748,8 +745,6 @@ public static long getUsedChemicalStorage(IGridNode node) {
             }
         }
 
-        used += getUsedExternalChemicalStorage(node);
-
         return used;
     }
 

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java

@@ -431,7 +431,7 @@ public MethodResult getUsedExternItemStorage() {
         if (!isAvailable())
             return notConnected();
 
-        return MethodResult.of(AppEngApi.getUsedExternalFluidStorage(node));
+        return MethodResult.of(AppEngApi.getUsedExternalItemStorage(node));
     }
 
     @Override

src/main/java/de/srendi/advancedperipherals/common/util/inventory/IStorageSystemPeripheral.java

@@ -29,94 +29,66 @@ public interface IStorageSystemPeripheral {
 
     MethodResult listFluids();
 
-
     MethodResult listCraftableItems();
 
-
     MethodResult listCraftableFluids();
 
     MethodResult listCells();
 
-
     MethodResult importItem(IComputerAccess computer, IArguments arguments) throws LuaException;
 
-
     MethodResult exportItem(IComputerAccess computer, IArguments arguments) throws LuaException;
 
-
     MethodResult importFluid(IComputerAccess computer, IArguments arguments) throws LuaException;
 
-
     MethodResult exportFluid(IComputerAccess computer, IArguments arguments) throws LuaException;
 
-
     MethodResult getFilteredPatterns(IArguments arguments) throws LuaException;
 
-
     MethodResult getPatterns();
 
-
     MethodResult getStoredEnergy();
 
-
     MethodResult getEnergyCapacity();
 
-
     MethodResult getEnergyUsage();
 
     MethodResult getAvgPowerInjection();
 
     MethodResult getTotalExternItemStorage();
 
-
     MethodResult getTotalExternFluidStorage();
 
-
     MethodResult getTotalItemStorage();
 
-
     MethodResult getTotalFluidStorage();
 
-
     MethodResult getUsedExternItemStorage();
 
-
     MethodResult getUsedExternFluidStorage();
 
-
     MethodResult getUsedItemStorage();
 
-
     MethodResult getUsedFluidStorage();
 
-
     MethodResult getAvailableExternItemStorage();
 
-
     MethodResult getAvailableExternFluidStorage();
 
-
     MethodResult getAvailableItemStorage();
 
-
     MethodResult getAvailableFluidStorage();
 
-
     MethodResult craftItem(IComputerAccess computer, IArguments arguments) throws LuaException;
 
-
     MethodResult craftFluid(IComputerAccess computer, IArguments arguments) throws LuaException;
 
-
     MethodResult isItemCraftable(IArguments arguments) throws LuaException;
 
-
     MethodResult isItemCrafting(IArguments arguments) throws LuaException;
 
-
     MethodResult isFluidCraftable(IArguments arguments) throws LuaException;
 
-
     MethodResult isFluidCrafting(IArguments arguments) throws LuaException;
 
 }