Fix #647

4 files changed, 129 insertions, 1 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
index 20165ffc1..040704236 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
@@ -24,6 +24,7 @@
 package me.shedaniel.rei.api.client.config;
 
 import me.shedaniel.clothconfig2.api.ModifierKeyCode;
+import me.shedaniel.rei.api.client.config.entry.EntryStackProvider;
 import me.shedaniel.rei.api.client.favorites.FavoriteEntry;
 import me.shedaniel.rei.api.client.gui.config.*;
 import me.shedaniel.rei.api.common.entry.EntryStack;
@@ -142,8 +143,12 @@ public interface ConfigObject {
     @ApiStatus.Experimental
     List<FavoriteEntry> getFavoriteEntries();
     
+    @ApiStatus.ScheduledForRemoval
+    @Deprecated
     List<EntryStack<?>> getFilteredStacks();
     
+    List<EntryStackProvider<?>> getFilteredStackProviders();
+    
     @ApiStatus.Experimental
     boolean shouldAsyncSearch();
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/entry/EntryStackProvider.java b/api/src/main/java/me/shedaniel/rei/api/client/config/entry/EntryStackProvider.java
new file mode 100644
index 000000000..3f784b798
--- /dev/null
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/entry/EntryStackProvider.java
@@ -0,0 +1,120 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.client.config.entry;
+
+import me.shedaniel.rei.api.common.entry.EntryStack;
+import me.shedaniel.rei.api.common.util.EntryStacks;
+import net.minecraft.nbt.CompoundTag;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.Objects;
+
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface EntryStackProvider<T> {
+    EntryStack<T> provide();
+    
+    CompoundTag save();
+    
+    boolean isValid();
+    
+    static <T> EntryStackProvider<T> defer(CompoundTag tag) {
+        return new EntryStackProvider<T>() {
+            private EntryStack<T> stack;
+            
+            @Override
+            public EntryStack<T> provide() {
+                if (stack == null) {
+                    try {
+                        stack = (EntryStack<T>) EntryStack.read(tag);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        return (EntryStack<T>) EntryStack.empty();
+                    }
+                    
+                    stack = stack.normalize();
+                }
+                
+                return stack;
+            }
+            
+            @Override
+            public CompoundTag save() {
+                return tag.copy();
+            }
+            
+            @Override
+            public boolean isValid() {
+                return !provide().isEmpty();
+            }
+            
+            @Override
+            public boolean equals(Object o) {
+                if (this == o) return true;
+                if (!(o instanceof EntryStackProvider)) return false;
+                EntryStackProvider<?> that = (EntryStackProvider<?>) o;
+                return Objects.equals(provide(), that.provide());
+            }
+            
+            @Override
+            public int hashCode() {
+                return Long.hashCode(EntryStacks.hashExact(provide()));
+            }
+        };
+    }
+    
+    static <T> EntryStackProvider<T> ofStack(EntryStack<T> stack) {
+        stack = stack.normalize();
+        EntryStack<T> finalStack = stack;
+        return new EntryStackProvider<T>() {
+            @Override
+            public EntryStack<T> provide() {
+                return finalStack;
+            }
+            
+            @Override
+            public CompoundTag save() {
+                return finalStack.save();
+            }
+            
+            @Override
+            public boolean isValid() {
+                return !finalStack.isEmpty();
+            }
+            
+            @Override
+            public boolean equals(Object o) {
+                if (this == o) return true;
+                if (!(o instanceof EntryStackProvider)) return false;
+                EntryStackProvider<?> that = (EntryStackProvider<?>) o;
+                return Objects.equals(provide(), that.provide());
+            }
+            
+            @Override
+            public int hashCode() {
+                return Long.hashCode(EntryStacks.hashExact(provide()));
+            }
+        };
+    }
+}
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
index 246a32979..ee8ecdbc6 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
@@ -45,7 +45,6 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java b/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java
index 09511ac6f..4288ba4e5 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java
@@ -162,6 +162,10 @@ public class CollectionUtils {
         return list.parallelStream().map(function).collect(Collectors.toCollection(supplier));
     }
     
+    public static <T, R, C extends Collection<R>> C filterAndMapParallel(Collection<T> list, Predicate<T> filter, Function<T, R> function, Supplier<C> supplier) {
+        return list.parallelStream().filter(filter).map(function).collect(Collectors.toCollection(supplier));
+    }
+    
     public static <T, R> List<R> map(T[] list, Function<T, R> function) {
         List<R> l = new ArrayList<>(list.length + 1);
         for (T t : list) {