Only show decompression patterns up to the most compressed available …

…variant
62832 · Jun 2, 2023 · 3121be7 · 3121be7
1 parent 54242d9
commit 3121be7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/common/src/main/java/gripe/_90/megacells/item/cell/BulkCellInventory.java b/common/src/main/java/gripe/_90/megacells/item/cell/BulkCellInventory.java
@@ -43,6 +43,7 @@ public class BulkCellInventory implements StorageCell {
     private final Object2IntMap<AEItemKey> compressed;
     private final Object2IntMap<AEItemKey> decompressed;
     private BigInteger unitCount;
+    private AEItemKey highestCompressed;
     private final long unitFactor;
     public final boolean compressionEnabled;
 
@@ -65,6 +66,7 @@ public BulkCellInventory(MEGABulkCell cell, ItemStack o, ISaveProvider container
 
         this.storedItem = getTag().contains(KEY) ? AEItemKey.fromTag(getTag().getCompound(KEY)) : null;
         this.unitCount = retrieveUnitCount();
+        this.highestCompressed = storedItem;
 
         this.compressionEnabled = cell.getUpgrades(i).isInstalled(COMPRESSION_CARD);
     }
@@ -109,6 +111,10 @@ public long getStoredQuantity() {
         return clampedLong(unitCount.divide(BigInteger.valueOf(unitFactor)), Long.MAX_VALUE);
     }
 
+    public AEItemKey getHighestCompressed() {
+        return highestCompressed;
+    }
+
     public AEItemKey getFilterItem() {
         return filterItem;
     }
@@ -270,6 +276,7 @@ public void getAvailableStacks(KeyCounter out) {
                         count = count.divide(compressionFactor);
                     } else {
                         out.add(variant, clampedLong(count, stackLimit));
+                        highestCompressed = variant;
                         break;
                     }
                 }

diff --git a/common/src/main/java/gripe/_90/megacells/service/DecompressionService.java b/common/src/main/java/gripe/_90/megacells/service/DecompressionService.java
@@ -117,7 +117,11 @@ private Object2IntMap<AEItemKey> getChain(BulkCellInventory cell) {
                 Collections.reverse(keys);
 
                 var decompressed = new Object2IntLinkedOpenHashMap<AEItemKey>();
-                keys.forEach(k -> decompressed.put(k, c.getInt(k)));
+
+                for (var key : keys.subList(keys.indexOf(cell.getHighestCompressed()), keys.size())) {
+                    decompressed.put(key, c.getInt(key));
+                }
+
                 return decompressed;
             }).orElseGet(Object2IntLinkedOpenHashMap::new);
         }