Visual fixes and fix ME Chest interaction

Author: Aedial

src/main/java/com/cellterminal/client/StorageBusInfo.java

@@ -99,9 +99,8 @@ public StorageBusInfo(NBTTagCompound nbt) {
         this.maxConfigSlots = nbt.hasKey("maxConfigSlots") ? nbt.getInteger("maxConfigSlots") : MAX_CONFIG_SLOTS;
 
         // Capability flags provided by scanners
-        this.supportsPriorityFlag = nbt.hasKey("supportsPriority") ? nbt.getBoolean("supportsPriority") : true;
-        // If not provided, default to buses supporting IO mode
-        this.supportsIOModeFlag = nbt.hasKey("supportsIOMode") ? nbt.getBoolean("supportsIOMode") : true;
+        this.supportsPriorityFlag = nbt.getBoolean("supportsPriority");
+        this.supportsIOModeFlag = nbt.getBoolean("supportsIOMode");
 
         // Connected inventory info
         this.connectedName = nbt.hasKey("connectedName") ? nbt.getString("connectedName") : null;

src/main/java/com/cellterminal/container/handler/CellDataHandler.java

@@ -322,6 +322,15 @@ private static String getStorageName(IChestOrDrive storage, String defaultName)
     }
 
     public static IItemHandler getCellInventory(IChestOrDrive storage) {
+        // TileChest has a combined internal inventory (input + cell), so we need special handling
+        // to return only the cell inventory portion.
+        if (storage instanceof TileChest) {
+            TileChest chest = (TileChest) storage;
+            IItemHandler wrapper = new TileChestCellInventoryWrapper(chest);
+
+            return wrapper;
+        }
+
         // Modular handling of Storage Drive-like tiles via AENetworkInvTile
         if (storage instanceof AENetworkInvTile) return ((AENetworkInvTile) storage).getInternalInventory();
 
@@ -332,6 +341,60 @@ public static IItemHandler getCellInventory(IChestOrDrive storage) {
         return null;
     }
 
+    /**
+     * Wrapper for TileChest's cell inventory.
+     * TileChest has getInternalInventory() returning a combined inventory where:
+     * - slot 0 = input inventory (for items to be stored)
+     * - slot 1 = cell inventory (the actual storage cell)
+     *
+     * This wrapper maps slot 0 to the cell slot (slot 1 of the internal inventory).
+     */
+    private static class TileChestCellInventoryWrapper implements IItemHandler {
+        private final TileChest chest;
+        private final IItemHandler internalInv;
+
+        public TileChestCellInventoryWrapper(TileChest chest) {
+            this.chest = chest;
+            this.internalInv = chest.getInternalInventory();
+        }
+
+        @Override
+        public int getSlots() {
+            return 1;  // TileChest has exactly 1 cell slot
+        }
+
+        @Override
+        public ItemStack getStackInSlot(int slot) {
+            if (slot != 0) return ItemStack.EMPTY;
+            // Slot 1 in the combined inventory is the cell slot
+            return internalInv.getStackInSlot(1);
+        }
+
+        @Override
+        public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
+            if (slot != 0) return stack;
+            return internalInv.insertItem(1, stack, simulate);
+        }
+
+        @Override
+        public ItemStack extractItem(int slot, int amount, boolean simulate) {
+            if (slot != 0) return ItemStack.EMPTY;
+            return internalInv.extractItem(1, amount, simulate);
+        }
+
+        @Override
+        public int getSlotLimit(int slot) {
+            if (slot != 0) return 0;
+            return internalInv.getSlotLimit(1);
+        }
+
+        @Override
+        public boolean isItemValid(int slot, ItemStack stack) {
+            if (slot != 0) return false;
+            return internalInv.isItemValid(1, stack);
+        }
+    }
+
     /**
      * Get cell inventory from ECOAEExtension's wrapped drive.
      */

src/main/java/com/cellterminal/gui/PopupCellInventory.java

@@ -220,11 +220,7 @@ public void drawTooltip(int mouseX, int mouseY) {
     }
 
     private String formatItemCount(long count) {
-        if (count <= 0) return "";
         if (count < 1000) return String.valueOf(count);
-        if (AEConfig.instance().isUseColoredCraftingStatus()) {
-            return ReadableNumberConverter.INSTANCE.toSlimReadableForm(count);
-        }
 
         return ReadableNumberConverter.INSTANCE.toWideReadableForm(count);
     }

src/main/java/com/cellterminal/gui/cells/CellSlotRenderer.java

@@ -233,7 +233,7 @@ public void drawSmallButton(int x, int y, boolean hovered, int fillColor) {
     public String formatItemCount(long count) {
         if (count < 1000) return String.valueOf(count);
 
-        return ReadableNumberConverter.INSTANCE.toSlimReadableForm(count);
+        return ReadableNumberConverter.INSTANCE.toWideReadableForm(count);
     }
 
     /**

src/main/java/com/cellterminal/gui/render/CellTerminalRenderer.java

@@ -70,10 +70,9 @@ protected void drawButton(int x, int y, int size, String label, boolean hovered)
      * Format item count for display.
      */
     protected String formatItemCount(long count) {
-        if (count <= 1) return "";
         if (count < 1000) return String.valueOf(count);
 
-        return ReadableNumberConverter.INSTANCE.toSlimReadableForm(count);
+        return ReadableNumberConverter.INSTANCE.toWideReadableForm(count);
     }
 
     /**

src/main/java/com/cellterminal/gui/storagebus/StorageBusSlotRenderer.java

@@ -232,7 +232,7 @@ public void drawIOModeDot(int x, int y, int size, AccessRestriction accessRestri
     public String formatItemCount(long count) {
         if (count < 1000) return String.valueOf(count);
 
-        return ReadableNumberConverter.INSTANCE.toSlimReadableForm(count);
+        return ReadableNumberConverter.INSTANCE.toWideReadableForm(count);
     }
 
     /**

src/main/java/com/cellterminal/integration/CrazyAEIntegration.java

@@ -1,5 +1,6 @@
 package com.cellterminal.integration;
 
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Optional;
@@ -93,12 +94,14 @@ private void scanImprovedDrives(IGrid grid, NBTTagList storageList, CellDataHand
                 dev.beecube31.crazyae2.common.tile.storage.TileImprovedDrive drive =
                     (dev.beecube31.crazyae2.common.tile.storage.TileImprovedDrive) gn.getMachine();
 
-                storageList.appendTag(CellDataHandler.createStorageData(
+                NBTTagCompound storageData = CellDataHandler.createStorageData(
                     drive,
                     "tile.crazyae.improved_drive.name",
                     callback,
                     slotLimit
-                ));
+                );
+                applyCapabilities(storageData);
+                storageList.appendTag(storageData);
             }
         }
     }

src/main/java/com/cellterminal/integration/ECOAEExtensionIntegration.java

@@ -121,7 +121,10 @@ private void scanEStorageChannels(IGrid grid, NBTTagList storageList, CellDataHa
                 // Each drive in the multiblock is presented as a separate storage entry
                 for (github.kasuminova.ecoaeextension.common.tile.ecotech.estorage.EStorageCellDrive drive : controller.getCellDrives()) {
                     NBTTagCompound driveData = createEStorageDriveData(drive, channelPriority, callback, slotLimit);
-                    if (driveData != null) storageList.appendTag(driveData);
+                    if (driveData != null) {
+                        applyCapabilities(driveData);
+                        storageList.appendTag(driveData);
+                    }
                 }
             }
         }

src/main/java/com/cellterminal/integration/storage/AE2StorageScanner.java

@@ -1,5 +1,6 @@
 package com.cellterminal.integration.storage;
 
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
 import appeng.api.networking.IGrid;
@@ -40,24 +41,28 @@ public void scanStorages(IGrid grid, NBTTagList storageList, CellDataHandler.Sto
         for (IGridNode gn : grid.getMachines(TileDrive.class)) {
             if (!gn.isActive()) continue;
 
-            storageList.appendTag(CellDataHandler.createStorageData(
+            NBTTagCompound storageData = CellDataHandler.createStorageData(
                 (TileDrive) gn.getMachine(),
                 "tile.appliedenergistics2.drive.name",
                 callback,
                 slotLimit
-            ));
+            );
+            applyCapabilities(storageData);
+            storageList.appendTag(storageData);
         }
 
         // Scan ME Chests
         for (IGridNode gn : grid.getMachines(TileChest.class)) {
             if (!gn.isActive()) continue;
 
-            storageList.appendTag(CellDataHandler.createStorageData(
+            NBTTagCompound storageData = CellDataHandler.createStorageData(
                 (TileChest) gn.getMachine(),
                 "tile.appliedenergistics2.chest.name",
                 callback,
                 slotLimit
-            ));
+            );
+            applyCapabilities(storageData);
+            storageList.appendTag(storageData);
         }
     }
 }

src/main/java/com/cellterminal/integration/storage/AbstractStorageScanner.java

@@ -1,6 +1,7 @@
 package com.cellterminal.integration.storage;
 
 import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagCompound;
 
 import appeng.api.networking.IGrid;
 
@@ -48,4 +49,12 @@ public abstract class AbstractStorageScanner implements IStorageScanner {
     public boolean supportsPriority() {
         return true;
     }
+
+    /**
+     * Apply common capability flags to the provided NBT payload.
+     * @param nbt The storage NBT data to modify
+     */
+    protected void applyCapabilities(NBTTagCompound nbt) {
+        nbt.setBoolean("supportsPriority", supportsPriority());
+    }
 }