Fixed upgrades not being able to be extracted properly in compacting drawers, closes #417

Author: Buuz135

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Support fractional factors and base amounts - Matyrobbrt
 * Fixed Controller, Access Point and Armory Cabinet having their model reversed, closes #435
 * Fixed being able to extract upgrades from Fluid Drawers, closes #437
+* Fixed upgrades not being able to be extracted properly in compacting drawers, closes #417
 
 # VERSION 1.5.1
 

src/main/java/com/buuz135/functionalstorage/block/tile/CompactingDrawerTile.java

@@ -119,9 +119,13 @@ public IItemHandler getStorage() {
 
     @Override
     protected boolean canChangeMultiplier(double newSizeMultiplier) {
-        var stack = getStorage().getStackInSlot(2);
-        if (stack.isEmpty()) return true;
-        return stack.getCount() <= Math.min(Integer.MAX_VALUE, Math.floor(stack.getMaxStackSize() * newSizeMultiplier));
+        for (int i = 0; i < getStorage().getSlots(); i++) {
+            var stored = getStorage().getStackInSlot(i);
+            if (!stored.isEmpty() && stored.getCount() > Math.min(Integer.MAX_VALUE, Math.floor(newSizeMultiplier * getHandler().getSlotLimitBase(i)))) {
+                return false;
+            }
+        }
+        return true;
     }
 
     @NotNull

src/main/java/com/buuz135/functionalstorage/block/tile/SimpleCompactingDrawerTile.java

@@ -120,9 +120,13 @@ public IItemHandler getStorage() {
 
     @Override
     protected boolean canChangeMultiplier(double newSizeMultiplier) {
-        var stack = getStorage().getStackInSlot(1);
-        if (stack.isEmpty()) return true;
-        return stack.getCount() <= Math.min(Integer.MAX_VALUE, Math.floor(stack.getMaxStackSize() * newSizeMultiplier));
+        for (int i = 0; i < getStorage().getSlots(); i++) {
+            var stored = getStorage().getStackInSlot(i);
+            if (!stored.isEmpty() && stored.getCount() > Math.min(Integer.MAX_VALUE, Math.floor(newSizeMultiplier * getHandler().getSlotLimitBase(i)))) {
+                return false;
+            }
+        }
+        return true;
     }
 
     @NotNull

src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java

@@ -155,7 +155,7 @@ public int getSlotLimit(int slot) {
 
     public int getSlotLimitBase(int slot) {
         if (slot == this.slots) return Integer.MAX_VALUE;
-        return (int) Math.min(Integer.MAX_VALUE, Math.floor(64 * 9 * 9f / this.resultList.get(slot).getNeeded()));
+        return (int) Math.min(Integer.MAX_VALUE, Math.floor((slots == 2 ? 64 * 9d  : 64 * 9d * 9)/ this.resultList.get(slot).getNeeded()));
     }
 
     @Override