Misc fixes

Author: Aedial

CHANGELOG.md

@@ -8,6 +8,15 @@ The format is based on Keep a Changelog and this project adheres to Semantic Ver
 - Semantic Versioning: https://semver.org/spec/v2.0.0.html
 
 
+## [1.3.0-rc2] - 2026-02-02
+### Added
+- Add exclusion of IICompactingCells from Partition Storage Cells from Content tool, as they should only have 1 partition, yet expose multiple item types
+
+### Fixed
+- Fix non-standard upgrade cards (not from base AE2) not being properly accepted for insertion into cells/storage buses
+- Fix Attribute Unique Tool not properly refreshing the network after execution, requiring manual cell re-insertion to see changes
+
+
 ## [1.3.0-rc1] - 2026-02-02
 ### Added
 - Add Network Tools as a 6th tab:

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

@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
@@ -36,9 +35,6 @@ public class CellInfo {
     private final List<Long> contentCounts = new ArrayList<>();
 
     // Upgrade tracking
-    private final boolean hasSticky;
-    private final boolean hasFuzzy;
-    private final boolean hasInverter;
     private final List<ItemStack> upgrades = new ArrayList<>();
     private final List<Integer> upgradeSlotIndices = new ArrayList<>();
 
@@ -56,11 +52,6 @@ public CellInfo(NBTTagCompound nbt) {
         this.totalTypes = nbt.getLong("totalTypes");
         this.storedItemCount = nbt.getLong("storedItemCount");
 
-        // Parse upgrade flags
-        this.hasSticky = nbt.getBoolean("hasSticky");
-        this.hasFuzzy = nbt.getBoolean("hasFuzzy");
-        this.hasInverter = nbt.getBoolean("hasInverter");
-
         // Parse upgrade items for display
         if (nbt.hasKey("upgrades")) {
             NBTTagList upgradeList = nbt.getTagList("upgrades", Constants.NBT.TAG_COMPOUND);
@@ -216,16 +207,17 @@ public String getDisplayName() {
         return I18n.format("gui.cellterminal.cell_empty");
     }
 
+    // TODO: replace with the ItemStack to avoid Type Squatting
     public boolean hasSticky() {
-        return hasSticky;
+        return getInstalledUpgrades(Upgrades.STICKY) > 0;
     }
 
     public boolean hasFuzzy() {
-        return hasFuzzy;
+        return getInstalledUpgrades(Upgrades.FUZZY) > 0;
     }
 
     public boolean hasInverter() {
-        return hasInverter;
+        return getInstalledUpgrades(Upgrades.INVERTER) > 0;
     }
 
     public List<ItemStack> getUpgrades() {
@@ -245,6 +237,7 @@ public int getUpgradeSlotIndex(int index) {
 
     public int getUpgradeSlotCount() {
         // Standard AE2 cells have 2 upgrade slots
+        // TODO: adjust if supporting cells with different upgrade slot counts
         return 2;
     }
 
@@ -256,22 +249,6 @@ public boolean hasUpgradeSpace() {
         return upgrades.size() < getUpgradeSlotCount();
     }
 
-    /**
-     * Check if a specific upgrade type is supported by this cell.
-     * @param upgradeType The upgrade type to check
-     * @return The maximum count of this upgrade the cell supports, or 0 if not supported
-     */
-    public int getMaxInstalled(Upgrades upgradeType) {
-        if (cellItem.isEmpty() || upgradeType == null) return 0;
-
-        Map<ItemStack, Integer> supported = upgradeType.getSupported();
-        for (Map.Entry<ItemStack, Integer> entry : supported.entrySet()) {
-            if (ItemStack.areItemsEqual(entry.getKey(), cellItem)) return entry.getValue();
-        }
-
-        return 0;
-    }
-
     /**
      * Check how many of a specific upgrade type are currently installed.
      * @param upgradeType The upgrade type to count
@@ -292,25 +269,16 @@ public int getInstalledUpgrades(Upgrades upgradeType) {
     }
 
     /**
-     * Check if this cell can accept the given upgrade item.
-     * Checks both compatibility and available space.
+     * Check if this cell can potentially accept the given upgrade item.
+     * This is a client-side heuristic only - actual validation happens server-side.
+     * Checks if item is an upgrade module and if there's space in the upgrade inventory.
      * @param upgradeStack The upgrade item to check
-     * @return true if the upgrade can be inserted
+     * @return true if the upgrade might be insertable
      */
     public boolean canAcceptUpgrade(ItemStack upgradeStack) {
         if (upgradeStack.isEmpty()) return false;
         if (!(upgradeStack.getItem() instanceof IUpgradeModule)) return false;
-        if (!hasUpgradeSpace()) return false;
-
-        IUpgradeModule upgradeModule = (IUpgradeModule) upgradeStack.getItem();
-        Upgrades upgradeType = upgradeModule.getType(upgradeStack);
-        if (upgradeType == null) return false;
-
-        int maxInstalled = getMaxInstalled(upgradeType);
-        if (maxInstalled == 0) return false;
-
-        int currentInstalled = getInstalledUpgrades(upgradeType);
 
-        return currentInstalled < maxInstalled;
+        return hasUpgradeSpace();
     }
 }

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

@@ -55,13 +55,9 @@ public static int calculateAvailableSlots(int capacityUpgrades) {
     private final int dimension;
     private final EnumFacing side;
     private final int priority;
-    private final int capacityUpgrades;
     private final int baseConfigSlots;
     private final int slotsPerUpgrade;
     private final int maxConfigSlots;
-    private final boolean hasInverter;
-    private final boolean hasSticky;
-    private final boolean hasFuzzy;
     private final boolean isItem;      // True for item storage buses
     private final boolean isFluid;     // True for fluid storage buses
     private final boolean isEssentia;  // True for Thaumic Energistics essentia storage buses
@@ -83,10 +79,6 @@ public StorageBusInfo(NBTTagCompound nbt) {
         this.dimension = nbt.getInteger("dim");
         this.side = EnumFacing.byIndex(nbt.getInteger("side"));
         this.priority = nbt.getInteger("priority");
-        this.capacityUpgrades = nbt.getInteger("capacityUpgrades");
-        this.hasInverter = nbt.getBoolean("hasInverter");
-        this.hasSticky = nbt.getBoolean("hasSticky");
-        this.hasFuzzy = nbt.getBoolean("hasFuzzy");
         this.isFluid = nbt.getBoolean("isFluid");
         this.isEssentia = nbt.getBoolean("isEssentia");
         // Prefer explicit isItem flag; fallback to legacy inference if missing
@@ -194,31 +186,27 @@ public int getPriority() {
         return priority;
     }
 
-    public int getCapacityUpgrades() {
-        return capacityUpgrades;
-    }
-
     /**
      * Get the number of available config slots based on capacity upgrades.
      * Formula: 18 + 9 * capacityUpgrades, capped at 63.
      * Essentia buses always have 63 slots (they don't use capacity upgrades).
      */
     public int getAvailableConfigSlots() {
-        int raw = baseConfigSlots + slotsPerUpgrade * Math.max(0, capacityUpgrades);
+        int raw = baseConfigSlots + slotsPerUpgrade * Math.max(0, getInstalledUpgrades(Upgrades.CAPACITY));
 
         return raw > maxConfigSlots ? maxConfigSlots : raw;
     }
 
     public boolean hasInverter() {
-        return hasInverter;
+        return getInstalledUpgrades(Upgrades.INVERTER) > 0;
     }
 
     public boolean hasSticky() {
-        return hasSticky;
+        return getInstalledUpgrades(Upgrades.STICKY) > 0;
     }
 
     public boolean hasFuzzy() {
-        return hasFuzzy;
+        return getInstalledUpgrades(Upgrades.FUZZY) > 0;
     }
 
     public boolean isFluid() {
@@ -390,31 +378,6 @@ public boolean hasUpgradeSpace() {
         return upgrades.size() < 5;
     }
 
-    /**
-     * Get the maximum number of a specific upgrade type this storage bus can hold.
-     * @param upgradeType The upgrade type to check
-     * @return The maximum count, or 0 if not supported
-     */
-    public int getMaxInstalled(Upgrades upgradeType) {
-        if (upgradeType == null) return 0;
-
-        // Essentia buses don't support standard AE2 upgrades
-        if (isEssentia) return 0;
-
-        switch (upgradeType) {
-            case CAPACITY:
-                return 5;
-            case INVERTER:
-            case STICKY:
-                return 1;
-            case FUZZY:
-                // Fluid storage buses don't support fuzzy
-                return isFluid ? 0 : 1;
-            default:
-                return 0;
-        }
-    }
-
     /**
      * Get the current installed count of a specific upgrade type.
      * @param upgradeType The upgrade type to count
@@ -423,44 +386,28 @@ public int getMaxInstalled(Upgrades upgradeType) {
     public int getInstalledUpgrades(Upgrades upgradeType) {
         if (upgradeType == null) return 0;
 
-        switch (upgradeType) {
-            case CAPACITY:
-                return capacityUpgrades;
-            case INVERTER:
-                return hasInverter ? 1 : 0;
-            case STICKY:
-                return hasSticky ? 1 : 0;
-            case FUZZY:
-                return hasFuzzy ? 1 : 0;
-            default:
-                return 0;
+        int count = 0;
+        for (ItemStack upgrade : upgrades) {
+            if (upgrade.getItem() instanceof IUpgradeModule) {
+                Upgrades type = ((IUpgradeModule) upgrade.getItem()).getType(upgrade);
+                if (type == upgradeType) count++;
+            }
         }
+
+        return count;
     }
 
     /**
-     * Check if this storage bus can accept the given upgrade item.
-     * Checks if the bus has upgrade space, the upgrade type is supported,
-     * and the current count is below the maximum for that upgrade type.
+     * Check if this storage bus can potentially accept the given upgrade item.
+     * This is a client-side heuristic only - actual validation happens server-side.
+     * Checks if item is an upgrade module and if there's space in the upgrade inventory.
      * @param upgradeStack The upgrade item to check
-     * @return true if the upgrade can be inserted
+     * @return true if the upgrade might be insertable
      */
     public boolean canAcceptUpgrade(ItemStack upgradeStack) {
         if (upgradeStack.isEmpty()) return false;
         if (!(upgradeStack.getItem() instanceof IUpgradeModule)) return false;
-        if (!hasUpgradeSpace()) return false;
-
-        // Essentia buses don't support standard AE2 upgrades
-        if (isEssentia) return false;
-
-        IUpgradeModule upgradeModule = (IUpgradeModule) upgradeStack.getItem();
-        Upgrades upgradeType = upgradeModule.getType(upgradeStack);
-        if (upgradeType == null) return false;
-
-        int maxInstalled = getMaxInstalled(upgradeType);
-        if (maxInstalled == 0) return false;
-
-        int currentInstalled = getInstalledUpgrades(upgradeType);
 
-        return currentInstalled < maxInstalled;
+        return hasUpgradeSpace();
     }
 }

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

@@ -10,8 +10,6 @@
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.AEApi;
-import appeng.api.config.Upgrades;
-import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.ICellInventory;
@@ -286,7 +284,6 @@ private static void populateCellUpgrades(NBTTagCompound cellData, IItemHandler u
         if (upgradesInv == null) return;
 
         NBTTagList upgradeList = new NBTTagList();
-        boolean hasSticky = false, hasFuzzy = false, hasInverter = false;
 
         for (int i = 0; i < upgradesInv.getSlots(); i++) {
             ItemStack upgrade = upgradesInv.getStackInSlot(i);
@@ -296,19 +293,9 @@ private static void populateCellUpgrades(NBTTagCompound cellData, IItemHandler u
             upgrade.writeToNBT(upgradeNbt);
             upgradeNbt.setInteger("slot", i);
             upgradeList.appendTag(upgradeNbt);
-
-            if (upgrade.getItem() instanceof IUpgradeModule) {
-                Upgrades type = ((IUpgradeModule) upgrade.getItem()).getType(upgrade);
-                if (type == Upgrades.STICKY) hasSticky = true;
-                else if (type == Upgrades.FUZZY) hasFuzzy = true;
-                else if (type == Upgrades.INVERTER) hasInverter = true;
-            }
         }
 
         cellData.setTag("upgrades", upgradeList);
-        cellData.setBoolean("hasSticky", hasSticky);
-        cellData.setBoolean("hasFuzzy", hasFuzzy);
-        cellData.setBoolean("hasInverter", hasInverter);
     }
 
     private static String getStorageName(IChestOrDrive storage, String defaultName) {