Fix #647

6 files changed, 57 insertions, 38 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
index e6eefa6b6..231709cf0 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
@@ -49,6 +49,7 @@ import me.shedaniel.clothconfig2.gui.entries.TextListEntry;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.config.ConfigManager;
+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.DisplayScreenType;
 import me.shedaniel.rei.api.client.gui.config.SyntaxHighlightingMode;
@@ -82,6 +83,7 @@ import org.apache.commons.lang3.mutable.MutableLong;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.*;
+import java.util.function.Consumer;
 
 import static me.shedaniel.autoconfig.util.Utils.getUnsafely;
 import static me.shedaniel.autoconfig.util.Utils.setUnsafely;
@@ -116,11 +118,17 @@ public class ConfigManagerImpl implements ConfigManager {
         guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) ->
                         Collections.singletonList(new SearchFilterSyntaxHighlightingEntry(new TranslatableComponent(i13n), getUnsafely(field, config, SyntaxHighlightingMode.COLORFUL), getUnsafely(field, defaults), type -> setUnsafely(field, config, type)))
                 , (field) -> field.getType() == SyntaxHighlightingMode.class, ConfigObjectImpl.UseSpecialSearchFilterSyntaxHighlightingScreen.class);
-        guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) ->
-                        REIRuntime.getInstance().getPreviousContainerScreen() == null || Minecraft.getInstance().getConnection() == null || Minecraft.getInstance().getConnection().getRecipeManager() == null ?
-                                Collections.singletonList(new NoFilteringEntry(220, getUnsafely(field, config, new ArrayList<>()), getUnsafely(field, defaults), list -> setUnsafely(field, config, list)))
-                                :
-                                Collections.singletonList(new FilteringEntry(220, getUnsafely(field, config, new ArrayList<>()), ((ConfigObjectImpl.Advanced.Filtering) config).filteringRules, getUnsafely(field, defaults), list -> setUnsafely(field, config, list), list -> ((ConfigObjectImpl.Advanced.Filtering) config).filteringRules = Lists.newArrayList(list)))
+        guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) -> {
+                    List<EntryStack<?>> value = CollectionUtils.map(Utils.<List<EntryStackProvider<?>>>getUnsafely(field, config, new ArrayList<>()), EntryStackProvider::provide);
+                    List<EntryStack<?>> defaultValue = CollectionUtils.map(Utils.<List<EntryStackProvider<?>>>getUnsafely(field, defaults), EntryStackProvider::provide);
+                    Consumer<List<EntryStack<?>>> saveConsumer = (newValue) -> {
+                        setUnsafely(field, config, CollectionUtils.map(newValue, EntryStackProvider::ofStack));
+                    };
+                    return REIRuntime.getInstance().getPreviousContainerScreen() == null || Minecraft.getInstance().getConnection() == null || Minecraft.getInstance().getConnection().getRecipeManager() == null ?
+                            Collections.singletonList(new NoFilteringEntry(220, value, defaultValue, saveConsumer))
+                            :
+                            Collections.singletonList(new FilteringEntry(220, value, ((ConfigObjectImpl.Advanced.Filtering) config).filteringRules, defaultValue, saveConsumer, list -> ((ConfigObjectImpl.Advanced.Filtering) config).filteringRules = Lists.newArrayList(list)));
+                }
                 , (field) -> field.getType() == List.class, ConfigObjectImpl.UseFilteringScreen.class);
         saveConfig();
         RoughlyEnoughItemsCore.LOGGER.info("Config loaded.");
@@ -165,8 +173,8 @@ public class ConfigManagerImpl implements ConfigManager {
             }
         });
         
-        // EntryStack
-        builder.registerSerializer(EntryStack.class, (stack, marshaller) -> {
+        // EntryStackProvider
+        builder.registerSerializer(EntryStackProvider.class, (stack, marshaller) -> {
             try {
                 return marshaller.serialize(stack.save());
             } catch (Exception e) {
@@ -174,20 +182,15 @@ public class ConfigManagerImpl implements ConfigManager {
                 return JsonNull.INSTANCE;
             }
         });
-        builder.registerDeserializer(Tag.class, EntryStack.class, (value, marshaller) -> {
-            try {
-                return EntryStack.read((CompoundTag) value);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return EntryStack.empty();
-            }
+        builder.registerDeserializer(Tag.class, EntryStackProvider.class, (value, marshaller) -> {
+            return EntryStackProvider.defer((CompoundTag) value);
         });
-        builder.registerDeserializer(String.class, EntryStack.class, (value, marshaller) -> {
+        builder.registerDeserializer(String.class, EntryStackProvider.class, (value, marshaller) -> {
             try {
-                return EntryStack.read(TagParser.parseTag(value));
-            } catch (Exception e) {
+                return EntryStackProvider.defer(TagParser.parseTag(value));
+            } catch (CommandSyntaxException e) {
                 e.printStackTrace();
-                return EntryStack.empty();
+                return EntryStackProvider.ofStack(EntryStack.empty());
             }
         });
         
@@ -255,12 +258,6 @@ public class ConfigManagerImpl implements ConfigManager {
         if (getConfig().getFavoriteEntries() != null) {
             getConfig().getFavoriteEntries().removeIf(Objects::isNull);
         }
-        if (getConfig().getFilteredStacks() != null) {
-            getConfig().getFilteredStacks().removeIf(EntryStack::isEmpty);
-            List<EntryStack<?>> normalizedFilteredStacks = CollectionUtils.map(getConfig().getFilteredStacks(), EntryStack::normalize);
-            getConfig().getFilteredStacks().clear();
-            getConfig().getFilteredStacks().addAll(normalizedFilteredStacks);
-        }
         if (getConfig().getFilteringRules().stream().noneMatch(filteringRule -> filteringRule instanceof ManualFilteringRule)) {
             getConfig().getFilteringRules().add(new ManualFilteringRule());
         }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
index 3895bc4fc..096a49e8b 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
@@ -32,9 +32,11 @@ import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment;
 import me.shedaniel.clothconfig2.api.Modifier;
 import me.shedaniel.clothconfig2.api.ModifierKeyCode;
 import me.shedaniel.rei.api.client.config.ConfigObject;
+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;
+import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.impl.client.entry.filtering.FilteringRule;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -46,6 +48,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @ApiStatus.Internal
@@ -303,6 +306,11 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData {
     
     @Override
     public List<EntryStack<?>> getFilteredStacks() {
+        return Collections.unmodifiableList(CollectionUtils.map(advanced.filtering.filteredStacks, EntryStackProvider::provide));
+    }
+    
+    @Override
+    public List<EntryStackProvider<?>> getFilteredStackProviders() {
         return advanced.filtering.filteredStacks;
     }
     
@@ -541,7 +549,7 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData {
         }
         
         public static class Filtering {
-            @UseFilteringScreen private List<EntryStack<?>> filteredStacks = new ArrayList<>();
+            @UseFilteringScreen private List<EntryStackProvider<?>> filteredStacks = new ArrayList<>();
             @ConfigEntry.Gui.Excluded public List<FilteringRule<?>> filteringRules = new ArrayList<>();
         }
     }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/ManualFilteringRule.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/ManualFilteringRule.java
index 480235778..c8fb61998 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/ManualFilteringRule.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/ManualFilteringRule.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.impl.client.entry.filtering.rules;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import me.shedaniel.rei.api.client.config.ConfigObject;
+import me.shedaniel.rei.api.client.config.entry.EntryStackProvider;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.api.common.util.EntryStacks;
@@ -59,7 +60,7 @@ public class ManualFilteringRule extends AbstractFilteringRule<ManualFilteringRu
     }
     
     private void processList(Collection<EntryStack<?>> stacks, FilteringResult result) {
-        LongSet filteredStacks = CollectionUtils.mapParallel(ConfigObject.getInstance().getFilteredStacks(), EntryStacks::hashExact, LongOpenHashSet::new);
+        LongSet filteredStacks = CollectionUtils.filterAndMapParallel(ConfigObject.getInstance().getFilteredStackProviders(), EntryStackProvider::isValid, provider -> EntryStacks.hashExact(provider.provide()), LongOpenHashSet::new);
         result.hide(stacks.parallelStream().filter(stack -> filteredStacks.contains(EntryStacks.hashExact(stack))).collect(Collectors.toList()));
     }
     
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/EntryStackSubsetsMenuEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/EntryStackSubsetsMenuEntry.java
index cb34786bf..7ec5bd243 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/EntryStackSubsetsMenuEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/EntryStackSubsetsMenuEntry.java
@@ -30,9 +30,9 @@ import me.shedaniel.rei.RoughlyEnoughItemsCoreClient;
 import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.config.ConfigManager;
 import me.shedaniel.rei.api.client.config.ConfigObject;
+import me.shedaniel.rei.api.client.config.entry.EntryStackProvider;
 import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
 import me.shedaniel.rei.api.common.entry.EntryStack;
-import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.impl.client.REIRuntimeImpl;
 import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
@@ -96,11 +96,11 @@ public class EntryStackSubsetsMenuEntry extends MenuEntry {
                 clickedLast = true;
                 if (!getParent().scrolling.draggingScrollBar) {
                     minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));
-                    List<EntryStack<?>> filteredStacks = ConfigObject.getInstance().getFilteredStacks();
+                    List<EntryStackProvider<?>> filteredStacks = ConfigObject.getInstance().getFilteredStackProviders();
                     if (isFiltered()) {
-                        filteredStacks.removeIf(next -> EntryStacks.equalsExact(next, stack));
+                        filteredStacks.removeIf(next -> EntryStacks.equalsExact(next.provide(), stack));
                     } else {
-                        filteredStacks.add(stack.normalize());
+                        filteredStacks.add(EntryStackProvider.ofStack(stack.normalize()));
                     }
                     Menu menu = ((ScreenOverlayImpl) REIRuntime.getInstance().getOverlay().get()).getOverlayMenu();
                     if (menu != null)
@@ -138,8 +138,12 @@ public class EntryStackSubsetsMenuEntry extends MenuEntry {
     
     public boolean isFiltered() {
         if (isFiltered == null) {
-            List<EntryStack<?>> filteredStacks = ConfigObject.getInstance().getFilteredStacks();
-            isFiltered = CollectionUtils.findFirstOrNullEqualsExact(filteredStacks, stack) != null;
+            isFiltered = false;
+            List<EntryStackProvider<?>> filteredStacks = ConfigObject.getInstance().getFilteredStackProviders();
+            for (EntryStackProvider<?> provider : filteredStacks) {
+                if (EntryStacks.equalsExact(provider.provide(), stack))
+                    return isFiltered = true;
+            }
         }
         return isFiltered;
     }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java
index 4ff812960..4481e3e28 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java
@@ -32,9 +32,9 @@ import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.config.ConfigManager;
 import me.shedaniel.rei.api.client.config.ConfigObject;
+import me.shedaniel.rei.api.client.config.entry.EntryStackProvider;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
 import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
-import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.impl.client.REIRuntimeImpl;
 import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
@@ -152,7 +152,7 @@ public class SubSubsetsMenuEntry extends MenuEntry {
         if (rendering && mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 12 && !entries.isEmpty()) {
             if (clickedBefore) {
                 clickedBefore = false;
-                List<EntryStack<?>> filteredStacks = ConfigObject.getInstance().getFilteredStacks();
+                List<EntryStackProvider<?>> filteredStacks = ConfigObject.getInstance().getFilteredStackProviders();
                 Menu overlay = ((ScreenOverlayImpl) REIRuntime.getInstance().getOverlay().get()).getOverlayMenu();
                 setFiltered(filteredStacks, overlay, this, !(getFilteredRatio() > 0));
                 ConfigManager.getInstance().saveConfig();
@@ -169,14 +169,14 @@ public class SubSubsetsMenuEntry extends MenuEntry {
         return super.mouseClicked(mouseX, mouseY, button);
     }
     
-    private void setFiltered(List<EntryStack<?>> filteredStacks, Menu subsetsMenu, SubSubsetsMenuEntry subSubsetsMenuEntry, boolean filtered) {
+    private void setFiltered(List<EntryStackProvider<?>> filteredStacks, Menu subsetsMenu, SubSubsetsMenuEntry subSubsetsMenuEntry, boolean filtered) {
         for (MenuEntry entry : subSubsetsMenuEntry.entries) {
             if (entry instanceof EntryStackSubsetsMenuEntry menuEntry) {
                 if (menuEntry.isFiltered() != filtered) {
                     if (!filtered) {
-                        filteredStacks.removeIf(next -> EntryStacks.equalsExact(next, menuEntry.stack));
+                        filteredStacks.removeIf(next -> EntryStacks.equalsExact(next.provide(), menuEntry.stack));
                     } else {
-                        filteredStacks.add(menuEntry.stack.normalize());
+                        filteredStacks.add(EntryStackProvider.ofStack(menuEntry.stack.normalize()));
                     }
                 }
                 if (subsetsMenu != null)
@@ -193,7 +193,7 @@ public class SubSubsetsMenuEntry extends MenuEntry {
     }
     
     public Tuple<Integer, Integer> getFilteredRatioPair() {
-        List<EntryStack<?>> filteredStacks = ConfigObject.getInstance().getFilteredStacks();
+        List<EntryStackProvider<?>> filteredStacks = ConfigObject.getInstance().getFilteredStackProviders();
         if (lastListHash != filteredStacks.hashCode()) {
             int size = 0;
             int filtered = 0;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
index 272bd1944..1c6e9d67f 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
@@ -29,6 +29,7 @@ import com.google.common.collect.Lists;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.config.ConfigObject;
+import me.shedaniel.rei.api.client.config.entry.EntryStackProvider;
 import me.shedaniel.rei.api.client.overlay.ScreenOverlay;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
@@ -119,6 +120,14 @@ public class EntryRegistryImpl implements EntryRegistry {
     
     @Override
     public void refilter() {
+        ConfigObject config = ConfigObject.getInstance();
+        if (config.getFilteredStackProviders() != null) {
+            List<EntryStack<?>> normalizedFilteredStacks = CollectionUtils.map(config.getFilteredStackProviders(), EntryStackProvider::provide);
+            normalizedFilteredStacks.removeIf(EntryStack::isEmpty);
+            config.getFilteredStackProviders().clear();
+            config.getFilteredStackProviders().addAll(CollectionUtils.map(normalizedFilteredStacks, EntryStackProvider::ofStack));
+        }
+        
         Stopwatch stopwatch = Stopwatch.createStarted();
         
         FilteringContextImpl context = new FilteringContextImpl(entries);