Disable extracting invisible items from Storage Buses altogether

Reverts d82cdab, closes #408 Allows Cells to report/extract lingering unpartitioned items
AE2-UEL · May 27, 2024 · 7fa7b72 · 7fa7b72
1 parent c814fe5
commit 7fa7b72
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
@@ -218,11 +218,7 @@ public void detectAndSendChanges() {
                         IAEItemStack m = null;
                         if (c != null && this.result.isSimulation()) {
                             m = o.copy();
-                            if (items.getStorageList().findPrecise(o) != null) {
-                                o = items.extractItems(o, Actionable.SIMULATE, this.getActionSource());
-                            } else {
-                                o = null;
-                            }
+                            o = items.extractItems(o, Actionable.SIMULATE, this.getActionSource());
 
                             if (o == null) {
                                 o = m.copy();

diff --git a/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java
@@ -134,4 +134,14 @@ public IncludeExclude getIncludeExcludeMode() {
     NBTTagCompound openNbtData() {
         return Platform.openNbtData(this.getCellInv().getItemStack());
     }
+
+    @Override
+    protected boolean canExtract(T request) {
+        return this.hasReadAccess();
+    }
+
+    @Override
+    protected boolean shouldItemBeAvailable(T request) {
+        return this.hasReadAccess();
+    }
 }
diff --git a/src/main/java/appeng/me/storage/MEInventoryHandler.java b/src/main/java/appeng/me/storage/MEInventoryHandler.java
@@ -43,6 +43,15 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
     private IPartitionList<T> myPartitionList;
 
     private AccessRestriction cachedAccessRestriction;
+
+    protected final boolean hasReadAccess() {
+        return hasReadAccess;
+    }
+
+    protected final boolean hasWriteAccess() {
+        return hasWriteAccess;
+    }
+
     private boolean hasReadAccess;
     private boolean hasWriteAccess;
     private boolean isSticky;
@@ -195,11 +204,11 @@ public void setSticky(boolean isSticky) {
     }
 
     protected boolean canExtract(T request) {
-        return this.hasReadAccess;
+        return this.hasReadAccess && this.passesBlackOrWhitelist(request);
     }
 
-    private boolean shouldItemBeAvailable(T t) {
-        return this.hasReadAccess && this.passesBlackOrWhitelist(t);
+    protected boolean shouldItemBeAvailable(T request) {
+        return this.hasReadAccess && this.passesBlackOrWhitelist(request);
     }
 
     public boolean passesBlackOrWhitelist(T input) {