diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java index 7979ea6..63d1879 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java @@ -307,8 +307,13 @@ public class TileEntityController extends TileEntity if (!SecurityManager.hasAccess(profile, (IProtectable) record.storage)) continue; } - if (record.storage instanceof IQuantifiable) { - IQuantifiable quantifiableStorage = (IQuantifiable) storage; + for (int i = 0, n = record.storage.getDrawerCount(); i < n; i++) { + if (!record.storage.isDrawerEnabled(i)) continue; + + IDrawer drawer = record.storage.getDrawer(i); + if (!(drawer instanceof IQuantifiable)) continue; + + IQuantifiable quantifiableStorage = (IQuantifiable) drawer; if (template == null) { template = quantifiableStorage; state = !template.isQuantified(); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java index 0dfb111..70dc832 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java @@ -650,8 +650,14 @@ public class TileEntityDrawersComp extends TileEntityDrawers { } @Override - public boolean isQuantified() { - return TileEntityDrawersComp.this.isQuantified(); + public boolean isQuantifiedSlot(int slot) { + return isQuantified(); + } + + @Override + public boolean setIsSlotQuantifiable(int slot, boolean state) { + setIsQuantified(state); + return true; } @Override diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java index 9c1a42f..0fa5d1e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java @@ -142,11 +142,13 @@ public class CompDrawerData extends BaseDrawerData @Override public boolean isQuantified() { - return central.isQuantified(); + return central.isQuantifiedSlot(slot); } @Override - public void setIsQuantified(boolean state) {}; + public boolean setIsQuantified(boolean state) { + return central.setIsSlotQuantifiable(slot, state); + }; @Override public boolean isLocked(LockAttribute attr) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java index 45022bd..f7858e3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java @@ -210,7 +210,9 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable } @Override - public void setIsQuantified(boolean state) {} + public boolean setIsQuantified(boolean state) { + return storageProvider.setIsQuantified(slot, state); + } @Override public boolean isLocked(LockAttribute attr) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java index bf4c2e5..2ec63d0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java @@ -38,7 +38,9 @@ public interface ICentralInventory { public boolean setIsSlotShrouded(int slot, boolean state); - public boolean isQuantified(); + public boolean isQuantifiedSlot(int slot); + + public boolean setIsSlotQuantifiable(int slot, boolean state); public boolean isLocked(int slot, LockAttribute attr);