Fixed being able to extract upgrades from Fluid Drawers, closes #437

Author: Buuz135

CHANGELOG.md

@@ -3,6 +3,8 @@
 * Update zh_cn.json 1.21 - Mooncywin
 * Create es_es.json and es_mx.json - ArrivedBog593
 * 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
 
 # VERSION 1.5.1
 

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

@@ -195,14 +195,11 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) {
                 ItemStack stack = this.getStackInSlot(slot);
                 if (stack.has(FSAttachments.FLUID_STORAGE_MODIFIER)) {
                     var replacement = new ItemStack[this.getSlots()];
-                    replacement[slot] = stack;
+                    replacement[slot] = ItemStack.EMPTY;
 
                     var newSize = SizeProvider.calculateAsFactor(this, FSAttachments.FLUID_STORAGE_MODIFIER, baseSize, replacement);
-                    for (int i = 0; i < getFluidHandler().getTanks(); i++) {
-                        var stored = getFluidHandler().getFluidInTank(i);
-                        if (stored.getAmount() > Math.min(Integer.MAX_VALUE, getTankCapacity(newSize))) {
-                            return ItemStack.EMPTY;
-                        }
+                    if (!canChangeMultiplier(newSize)) {
+                        return ItemStack.EMPTY;
                     }
                 }
                 return super.extractItem(slot, amount, simulate);
@@ -223,6 +220,15 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) {
                 .setSlotLimit(1);
     }
 
+    protected boolean canChangeMultiplier(double newSizeMultiplier) {
+        for (int i = 0; i < getFluidHandler().getTanks(); i++) {
+            var stored = getFluidHandler().getFluidInTank(i);
+            if (!stored.isEmpty() && stored.getAmount() > Math.min(Integer.MAX_VALUE, getTankCapacity(newSizeMultiplier))) {
+                return false;
+            }
+        }
+        return true;
+    }
 
     @Override
     public IFluidHandler getFluidHandler(@Nullable Direction direction) {