Only allow the configured fluid/item in configured interface slots (#…

…7752) Fixes #7695
AppliedEnergistics · Mar 12, 2024 · 3228dca · 3228dca
1 parent 8435f3d
commit 3228dca
Show file tree

Hide file tree

Showing 28 changed files with 423 additions and 215 deletions.
diff --git a/src/main/java/appeng/api/behaviors/GenericInternalInventory.java b/src/main/java/appeng/api/behaviors/GenericInternalInventory.java
@@ -46,7 +46,28 @@ public interface GenericInternalInventory {
     /**
      * Return true if the key would generally be allowed, ignoring the current state of the inventory.
      */
-    boolean isAllowed(AEKey what);
+    boolean isSupportedType(AEKeyType type);
+
+    /**
+     * Return true if the key would generally be allowed, ignoring the current state of the inventory.
+     */
+    default boolean isSupportedType(AEKey what) {
+        return isSupportedType(what.getType());
+    }
+
+    /**
+     * Return true if the key would generally be allowed, ignoring the current state of the inventory.
+     */
+    @Deprecated(since = "1.20.4")
+    default boolean isAllowed(AEKey what) {
+        return isSupportedType(what);
+    }
+
+    /**
+     * Return true if the key is {@link #isSupportedType(AEKey) of a supported type} and would pass a potential filter
+     * configured for the given slot.
+     */
+    boolean isAllowedIn(int slot, AEKey what);
 
     /**
      * Try to insert something into a given slot.

diff --git a/src/main/java/appeng/api/stacks/AEKeyTypes.java b/src/main/java/appeng/api/stacks/AEKeyTypes.java
@@ -24,6 +24,7 @@
 package appeng.api.stacks;
 
 import java.util.Objects;
+import java.util.Set;
 
 import net.minecraft.resources.ResourceLocation;
 
@@ -78,8 +79,7 @@ public static AEKeyType get(ResourceLocation id) {
      * <p>
      * This is mainly used as helper to let storage grids construct their internal storage for each type.
      */
-
-    public static Iterable<AEKeyType> getAll() {
-        return AEKeyTypesInternal.getRegistry();
+    public static Set<AEKeyType> getAll() {
+        return AEKeyTypesInternal.getAllTypes();
     }
 }
diff --git a/src/main/java/appeng/api/stacks/AEKeyTypesInternal.java b/src/main/java/appeng/api/stacks/AEKeyTypesInternal.java
@@ -1,11 +1,15 @@
 package appeng.api.stacks;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import com.google.common.base.Preconditions;
 
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.core.Registry;
+import net.neoforged.neoforge.registries.callback.BakeCallback;
 
 /**
  * Manages the registry used to synchronize key spaces to the client.
@@ -15,6 +19,9 @@ public final class AEKeyTypesInternal {
     @Nullable
     private static Registry<AEKeyType> registry;
 
+    @Nullable
+    private static Set<AEKeyType> allTypes;
+
     private AEKeyTypesInternal() {
     }
 
@@ -26,6 +33,18 @@ public static Registry<AEKeyType> getRegistry() {
     public static void setRegistry(Registry<AEKeyType> registry) {
         Preconditions.checkState(AEKeyTypesInternal.registry == null);
         AEKeyTypesInternal.registry = registry;
+        registry.addCallback((BakeCallback<AEKeyType>) (ignored -> {
+            var types = new HashSet<AEKeyType>();
+            for (var aeKeyType : registry) {
+                types.add(aeKeyType);
+            }
+            allTypes = Set.copyOf(types);
+        }));
+    }
+
+    public static Set<AEKeyType> getAllTypes() {
+        Preconditions.checkState(allTypes != null, "AE2 isn't initialized yet.");
+        return allTypes;
     }
 
     public static void register(AEKeyType keyType) {

diff --git a/src/main/java/appeng/api/storage/AEKeySlotFilter.java b/src/main/java/appeng/api/storage/AEKeySlotFilter.java
@@ -0,0 +1,8 @@
+package appeng.api.storage;
+
+import appeng.api.stacks.AEKey;
+
+@FunctionalInterface
+public interface AEKeySlotFilter {
+    boolean isAllowed(int slot, AEKey what);
+}
diff --git a/src/main/java/appeng/client/gui/implementations/KeyTypeSelectionScreen.java b/src/main/java/appeng/client/gui/implementations/KeyTypeSelectionScreen.java
@@ -4,8 +4,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import com.google.common.collect.Iterables;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.renderer.Rect2i;
@@ -117,7 +115,7 @@ public void populateScreen(Consumer<AbstractWidget> addWidget, Rect2i bounds, AE
                 yPos += KEY_TYPE_SPACING;
             }
 
-            int height = this.bounds.getY() + Iterables.size(AEKeyTypes.getAll()) * KEY_TYPE_SPACING + PADDING;
+            int height = this.bounds.getY() + AEKeyTypes.getAll().size() * KEY_TYPE_SPACING + PADDING;
             KeyTypeSelectionScreen.this.setHeight(height);
         }
     }

diff --git a/src/main/java/appeng/helpers/InterfaceLogic.java b/src/main/java/appeng/helpers/InterfaceLogic.java
@@ -47,6 +47,7 @@
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.stacks.AEKey;
+import appeng.api.stacks.AEKeyTypes;
 import appeng.api.stacks.GenericStack;
 import appeng.api.storage.MEStorage;
 import appeng.api.storage.StorageHelper;
@@ -102,8 +103,9 @@ public InterfaceLogic(IManagedGridNode gridNode, InterfaceLogicHost host, Item i
 
     public InterfaceLogic(IManagedGridNode gridNode, InterfaceLogicHost host, Item is, int slots) {
         this.host = host;
-        this.config = ConfigInventory.configStacks(null, slots, this::onConfigRowChanged, false);
-        this.storage = ConfigInventory.storage(slots, this::onStorageChanged);
+        this.config = ConfigInventory.configStacks(AEKeyTypes.getAll(), slots, this::onConfigRowChanged, false);
+        this.storage = ConfigInventory.storage(AEKeyTypes.getAll(), this::isAllowedInStorageSlot, slots,
+                this::onStorageChanged);
         this.mainNode = gridNode
                 .setFlags(GridFlags.REQUIRE_CHANNEL)
                 .addService(IGridTickable.class, new Ticker());
@@ -121,6 +123,14 @@ public InterfaceLogic(IManagedGridNode gridNode, InterfaceLogicHost host, Item i
         getStorage().useRegisteredCapacities();
     }
 
+    private boolean isAllowedInStorageSlot(int slot, AEKey what) {
+        if (slot < config.size()) {
+            var configured = config.getKey(slot);
+            return configured == null || configured.equals(what);
+        }
+        return true;
+    }
+
     public int getPriority() {
         return priority;
     }

diff --git a/src/main/java/appeng/helpers/externalstorage/GenericStackFluidStorage.java b/src/main/java/appeng/helpers/externalstorage/GenericStackFluidStorage.java
@@ -44,8 +44,11 @@ public int getTankCapacity(int tank) {
 
     @Override
     public boolean isFluidValid(int tank, @NotNull FluidStack stack) {
+        if (stack.isEmpty()) {
+            return true;
+        }
         var what = AEFluidKey.of(stack);
-        return what == null || inv.isAllowed(what);
+        return what != null && inv.isAllowedIn(tank, what);
     }
 
     @Override

diff --git a/src/main/java/appeng/helpers/externalstorage/GenericStackInv.java b/src/main/java/appeng/helpers/externalstorage/GenericStackInv.java
@@ -19,6 +19,7 @@
 package appeng.helpers.externalstorage;
 
 import java.util.Objects;
+import java.util.Set;
 
 import com.google.common.base.Preconditions;
 
@@ -39,9 +40,10 @@
 import appeng.api.stacks.AEItemKey;
 import appeng.api.stacks.AEKey;
 import appeng.api.stacks.AEKeyType;
+import appeng.api.stacks.AEKeyTypes;
 import appeng.api.stacks.GenericStack;
 import appeng.api.stacks.KeyCounter;
-import appeng.api.storage.AEKeyFilter;
+import appeng.api.storage.AEKeySlotFilter;
 import appeng.api.storage.MEStorage;
 import appeng.core.AELog;
 import appeng.util.ConfigMenuInventory;
@@ -52,8 +54,9 @@ public class GenericStackInv implements MEStorage, GenericInternalInventory {
     private boolean suppressOnChange;
     private boolean onChangeSuppressed;
     private final Reference2LongMap<AEKeyType> capacities = new Reference2LongArrayMap<>();
+    private final Set<AEKeyType> supportedKeyTypes;
     @Nullable
-    private AEKeyFilter filter;
+    private AEKeySlotFilter filter;
     protected final Mode mode;
     private Component description = Component.empty();
 
@@ -68,27 +71,28 @@ public GenericStackInv(@Nullable Runnable listener, int size) {
     }
 
     public GenericStackInv(@Nullable Runnable listener, Mode mode, int size) {
+        this(AEKeyTypes.getAll(), listener, mode, size);
+    }
+
+    public GenericStackInv(Set<AEKeyType> supportedKeyTypes, @Nullable Runnable listener, Mode mode, int size) {
+        this.supportedKeyTypes = Set.copyOf(Objects.requireNonNull(supportedKeyTypes, "supportedKeyTypes"));
         this.stacks = new GenericStack[size];
         this.listener = listener;
         this.mode = mode;
     }
 
-    protected void setFilter(@Nullable AEKeyFilter filter) {
+    protected void setFilter(@Nullable AEKeySlotFilter filter) {
         this.filter = filter;
     }
 
     @Nullable
-    public AEKeyFilter getFilter() {
+    public AEKeySlotFilter getFilter() {
         return filter;
     }
 
     @Override
-    public boolean isAllowed(AEKey what) {
-        return filter == null || filter.matches(what);
-    }
-
-    public boolean isAllowed(@Nullable GenericStack stack) {
-        return stack == null || isAllowed(stack.what());
+    public boolean isSupportedType(AEKeyType type) {
+        return supportedKeyTypes.contains(type);
     }
 
     @Override
@@ -139,7 +143,7 @@ public long insert(int slot, AEKey what, long amount, Actionable mode) {
         Objects.requireNonNull(what, "what");
         Preconditions.checkArgument(amount >= 0, "amount >= 0");
 
-        if (!canInsert() || !isAllowed(what)) {
+        if (!canInsert() || !isAllowedIn(slot, what)) {
             return 0;
         }
 
@@ -159,6 +163,10 @@ public long insert(int slot, AEKey what, long amount, Actionable mode) {
         return 0;
     }
 
+    public boolean isAllowedIn(int slot, AEKey what) {
+        return isSupportedType(what) && (filter == null || filter.isAllowed(slot, what));
+    }
+
     @Override
     public long extract(int slot, AEKey what, long amount, Actionable mode) {
         Objects.requireNonNull(what, "what");
@@ -371,7 +379,7 @@ public ConfigMenuInventory createMenuWrapper() {
     public long insert(AEKey what, long amount, Actionable mode, IActionSource source) {
         Objects.requireNonNull(what, "what");
         Preconditions.checkArgument(amount >= 0, "amount >= 0");
-        if (!isAllowed(what)) {
+        if (!isSupportedType(what)) {
             return 0;
         }
 

diff --git a/src/main/java/appeng/helpers/externalstorage/GenericStackItemStorage.java b/src/main/java/appeng/helpers/externalstorage/GenericStackItemStorage.java
@@ -70,7 +70,10 @@ public int getSlotLimit(int slot) {
 
     @Override
     public boolean isItemValid(int slot, @NotNull ItemStack stack) {
+        if (stack.isEmpty()) {
+            return true;
+        }
         var what = AEItemKey.of(stack);
-        return what == null || inv.isAllowed(what);
+        return what != null && inv.isAllowedIn(slot, what);
     }
 }
diff --git a/src/main/java/appeng/items/contents/CellConfig.java b/src/main/java/appeng/items/contents/CellConfig.java
@@ -18,38 +18,39 @@
 
 package appeng.items.contents;
 
-import com.google.common.base.Preconditions;
+import java.util.Set;
 
-import org.jetbrains.annotations.Nullable;
+import com.google.common.base.Preconditions;
 
 import net.minecraft.world.item.ItemStack;
 
-import appeng.api.storage.AEKeyFilter;
+import appeng.api.stacks.AEKeyType;
+import appeng.api.stacks.AEKeyTypes;
 import appeng.util.ConfigInventory;
 
 public final class CellConfig {
     private CellConfig() {
     }
 
-    public static ConfigInventory create(@Nullable AEKeyFilter filter, ItemStack is, int size) {
+    public static ConfigInventory create(Set<AEKeyType> supportedTypes, ItemStack is, int size) {
         Preconditions.checkArgument(size >= 1 && size <= 63,
                 "Config inventory must have between 1 and 63 slots inclusive.");
         var holder = new Holder(is);
-        holder.inv = ConfigInventory.configTypes(filter, size, holder::save);
+        holder.inv = ConfigInventory.configTypes(supportedTypes, size, holder::save);
         holder.load();
         return holder.inv;
     }
 
-    public static ConfigInventory create(@Nullable AEKeyFilter filter, ItemStack is) {
+    public static ConfigInventory create(Set<AEKeyType> supportedTypes, ItemStack is) {
         var holder = new Holder(is);
-        holder.inv = ConfigInventory.configTypes(filter, 63, holder::save);
+        holder.inv = ConfigInventory.configTypes(supportedTypes, 63, holder::save);
         holder.load();
         return holder.inv;
     }
 
     public static ConfigInventory create(ItemStack is) {
         var holder = new Holder(is);
-        holder.inv = ConfigInventory.configTypes(null, 63, holder::save);
+        holder.inv = ConfigInventory.configTypes(AEKeyTypes.getAll(), 63, holder::save);
         holder.load();
         return holder.inv;
     }

diff --git a/src/main/java/appeng/items/storage/BasicStorageCell.java b/src/main/java/appeng/items/storage/BasicStorageCell.java
@@ -20,6 +20,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
@@ -126,7 +127,7 @@ public IUpgradeInventory getUpgrades(ItemStack is) {
 
     @Override
     public ConfigInventory getConfigInventory(ItemStack is) {
-        return CellConfig.create(keyType.filter(), is);
+        return CellConfig.create(Set.of(keyType), is);
     }
 
     @Override

diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -534,7 +535,7 @@ private void onUpgradesChanged(ItemStack stack, IUpgradeInventory upgrades) {
 
     @Override
     public ConfigInventory getConfigInventory(ItemStack is) {
-        return CellConfig.create(AEItemKey.filter(), is);
+        return CellConfig.create(Set.of(AEKeyType.items()), is);
     }
 
     @Override

diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java
@@ -20,6 +20,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -390,7 +391,7 @@ private void onUpgradesChanged(ItemStack stack, IUpgradeInventory upgrades) {
 
     @Override
     public ConfigInventory getConfigInventory(ItemStack is) {
-        return CellConfig.create(AEItemKey.filter(), is);
+        return CellConfig.create(Set.of(AEKeyType.items()), is);
     }
 
     @Override

diff --git a/src/main/java/appeng/items/tools/powered/PortableCellItem.java b/src/main/java/appeng/items/tools/powered/PortableCellItem.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -108,7 +109,7 @@ public IUpgradeInventory getUpgrades(ItemStack is) {
 
     @Override
     public ConfigInventory getConfigInventory(ItemStack is) {
-        return CellConfig.create(keyType.filter(), is);
+        return CellConfig.create(Set.of(keyType), is);
     }
 
     @Override