Icon changed and small logic tweak to always filter inputs if filtere…

…d input is set
pedroksl · Jan 10, 2025 · 2d37b57 · 2d37b57
1 parent 1955ccf
commit 2d37b57
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/...ain/java/net/pedroksl/advanced_ae/common/inventory/AdvPatternProviderReturnInventory.java b/...ain/java/net/pedroksl/advanced_ae/common/inventory/AdvPatternProviderReturnInventory.java
@@ -6,6 +6,7 @@
 import net.pedroksl.advanced_ae.api.AAESettings;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic;
 
+import java.util.HashSet;
 import java.util.Set;
 
 public class AdvPatternProviderReturnInventory extends PatternProviderReturnInventory {
@@ -15,15 +16,18 @@ public AdvPatternProviderReturnInventory(Runnable listener, AdvPatternProviderLo
         this.setFilter((slot, what) -> {
             var filter = logic.getConfigManager().getSetting(AAESettings.FILTERED_IMPORT);
             if (filter != YesNo.YES) return true;
-            Set<AEKey> tracked = logic.getTrackedCrafts();
-            if (tracked.isEmpty()) return true;
 
-            for (AEKey craft : tracked) {
-                if (what.equals(craft)) {
-                    return true;
+            Set<AEKey> tracked = logic.getTrackedCrafts();
+            if (!tracked.isEmpty()) {
+                for (AEKey craft : tracked) {
+                    if (what.equals(craft)) {
+                        return true;
+                    }
                 }
             }
-            return false;
+
+            HashSet<AEKey> cached = logic.getOutputCache();
+            return cached.stream().anyMatch(what::equals);
         });
     }
 }
diff --git a/src/main/java/net/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogic.java b/src/main/java/net/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogic.java
@@ -99,6 +99,7 @@ public class AdvPatternProviderLogic implements InternalInventoryHost, ICrafting
     private final PatternProviderReturnInventory returnInv;
 
     private final AdvPatternProviderTargetCache[] targetCaches = new AdvPatternProviderTargetCache[6];
+    private final HashSet<AEKey> outputCache = new HashSet<>();
 
     private YesNo redstoneState = YesNo.UNDECIDED;
 
@@ -291,6 +292,7 @@ public boolean isClientSide() {
     public void updatePatterns() {
         patterns.clear();
         patternInputs.clear();
+        outputCache.clear();
         if (craftingWatcher != null) {
             craftingWatcher.reset();
         }
@@ -305,6 +307,7 @@ public void updatePatterns() {
                 if (craftingWatcher != null) {
                     for (var output : details.getOutputs()) {
                         craftingWatcher.add(output.what());
+                        outputCache.add(output.what());
                     }
                 }
 
@@ -819,6 +822,10 @@ public Set<AEKey> getTrackedCrafts() {
         return trackedCrafts;
     }
 
+    public HashSet<AEKey> getOutputCache() {
+        return outputCache;
+    }
+
     private class Ticker implements IGridTickable {
 
         @Override