Fix #1396 and fix #998

2 files changed, 24 insertions, 4 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 45d66c860..02afcd7f4 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
@@ -272,6 +272,9 @@ public interface ConfigObject {
     
     boolean doesCacheEntryRendering();
     
+    @ApiStatus.Experimental
+    boolean doesCacheDisplayLookup();
+    
     boolean doDebugRenderTimeRequired();
     
     boolean doMergeDisplayUnderOne();
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 eb0449f48..bd8376e53 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
@@ -23,12 +23,10 @@
 
 package me.shedaniel.rei.api.common.util;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.collect.UnmodifiableIterator;
+import com.google.common.collect.*;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -550,4 +548,23 @@ public class CollectionUtils {
             return size;
         }
     }
+    
+    public static <T> Iterable<T> distinctReferenceOf(Iterable<T> iterable) {
+        return () -> new AbstractIterator<T>() {
+            private final Set<T> set = new ReferenceOpenHashSet<>();
+            private final Iterator<T> iterator = iterable.iterator();
+            
+            @Override
+            protected T computeNext() {
+                while (iterator.hasNext()) {
+                    T next = iterator.next();
+                    if (set.add(next)) {
+                        return next;
+                    }
+                }
+                
+                return endOfData();
+            }
+        };
+    }
 }