Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19

# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
#	fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/AutoCraftingEvaluator.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java

11 files changed, 195 insertions, 47 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 d7cccd915..f2f9ad795 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
@@ -272,9 +272,6 @@ public class ConfigManagerImpl implements ConfigManager {
     
     @Override
     public void saveConfig() {
-        if (getConfig().getFavoriteEntries() != null) {
-            getConfig().getFavoriteEntries().removeIf(Objects::isNull);
-        }
         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 28f45277b..0bfa01856 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
@@ -369,6 +369,10 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData {
     @Override
     public List<FavoriteEntry> getFavoriteEntries() {
         return basics.favorites;
+    } 
+    
+    public List<FavoriteEntry> getHiddenFavoriteEntries() {
+        return basics.hiddenFavorites;
     }
     
     @Override
@@ -526,6 +530,7 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData {
     
     public static class Basics {
         @ConfigEntry.Gui.Excluded public List<FavoriteEntry> favorites = new ArrayList<>();
+        @ConfigEntry.Gui.Excluded public List<FavoriteEntry> hiddenFavorites = new ArrayList<>();
         @Comment("Declares whether cheating mode is on.") @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         private CheatingMode cheating = CheatingMode.OFF;
         private boolean favoritesEnabled = true;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java
index 82439dd62..45e598625 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java
@@ -34,6 +34,8 @@ import me.shedaniel.rei.api.client.favorites.FavoriteEntryType;
 import me.shedaniel.rei.api.client.favorites.SystemFavoriteEntryProvider;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.common.registry.ReloadStage;
+import me.shedaniel.rei.api.common.util.CollectionUtils;
+import me.shedaniel.rei.impl.client.config.ConfigManagerImpl;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import org.apache.commons.lang3.mutable.MutableLong;
@@ -113,8 +115,8 @@ public class FavoriteEntryTypeRegistryImpl implements FavoriteEntryType.Registry
     @Override
     public void endReload() {
         if (ConfigObject.getInstance().isFavoritesEnabled()) {
-            List<FavoriteEntry> favorites = ConfigObject.getInstance().getFavoriteEntries();
-            favorites.removeIf(FavoriteEntry::isInvalid);
+            ConfigObject.getInstance().getFavoriteEntries().removeIf(FavoriteEntry::isInvalid);
+            ConfigManagerImpl.getInstance().getConfig().getHiddenFavoriteEntries().removeIf(FavoriteEntry::isInvalid);
             
             ConfigManager.getInstance().saveConfig();
         }
@@ -122,15 +124,16 @@ public class FavoriteEntryTypeRegistryImpl implements FavoriteEntryType.Registry
     
     private static class SectionImpl implements FavoriteEntryType.Section {
         private final Component text;
-        private final List<FavoriteEntry> entries = new ArrayList<>();
+        private final List<CompoundEntry> entries = new ArrayList<>();
         
         public SectionImpl(Component text) {
             this.text = text;
         }
         
         @Override
-        public void add(FavoriteEntry... entries) {
-            Collections.addAll(this.entries, entries);
+        public void add(boolean defaultFavorited, FavoriteEntry... entries) {
+            this.entries.addAll(CollectionUtils.map(entries,
+                    entry -> new CompoundEntry(entry, defaultFavorited)));
         }
         
         @Override
@@ -140,7 +143,14 @@ public class FavoriteEntryTypeRegistryImpl implements FavoriteEntryType.Registry
         
         @Override
         public List<FavoriteEntry> getEntries() {
-            return entries;
+            return CollectionUtils.map(entries, CompoundEntry::entry);
         }
+        
+        @Override
+        public List<FavoriteEntry> getDefaultEntries() {
+            return CollectionUtils.filterAndMap(entries, CompoundEntry::defaultFavorited, CompoundEntry::entry);
+        }
+        
+        public record CompoundEntry(FavoriteEntry entry, boolean defaultFavorited) {}
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java
index 9895def4f..755d303df 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java
@@ -67,7 +67,7 @@ public final class RecipeDisplayExporter extends Widget {
         Collection<ResourceLocation> locations = display.provideInternalDisplayIds();
         String string = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date());
         if (!locations.isEmpty()) {
-            string = locations.iterator().next().toString().replace('/', '_');
+            string = locations.iterator().next().toString().replace('/', '_').replace(':', '_');
         }
         int i = 1;
         
@@ -114,7 +114,7 @@ public final class RecipeDisplayExporter extends Widget {
         }
         Util.ioPool().execute(() -> {
             try {
-                File export = new File(minecraft.gameDirectory, "rei_exports/" + display.provideInternalDisplay().getCategoryIdentifier().toString().replace('/', '_'));
+                File export = new File(minecraft.gameDirectory, "rei_exports/" + display.provideInternalDisplay().getCategoryIdentifier().toString().replace('/', '_').replace(':', '_'));
                 export.mkdirs();
                 strippedImage.writeToFile(getExportFilename(display, export));
             } catch (IOException e) {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
index 6f3d20eb5..20072ec30 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
@@ -72,6 +72,7 @@ import me.shedaniel.rei.impl.client.gui.widget.InternalWidgets;
 import me.shedaniel.rei.impl.client.gui.widget.LateRenderable;
 import me.shedaniel.rei.impl.client.gui.widget.entrylist.EntryListSearchManager;
 import me.shedaniel.rei.impl.client.gui.widget.entrylist.EntryListWidget;
+import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesEntriesManager;
 import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesListWidget;
 import me.shedaniel.rei.impl.client.gui.widget.search.OverlaySearchField;
 import me.shedaniel.rei.impl.common.util.Weather;
@@ -802,12 +803,7 @@ public class ScreenOverlayImpl extends ScreenOverlay {
                 return ViewSearchBuilder.builder().addUsagesFor(stack).open();
             } else if (ConfigObject.getInstance().getFavoriteKeyCode().matchesKey(keyCode, scanCode)) {
                 FavoriteEntry favoriteEntry = FavoriteEntry.fromEntryStack(stack);
-                ConfigObject.getInstance().getFavoriteEntries().remove(favoriteEntry);
-                ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
-                ConfigManager.getInstance().saveConfig();
-                FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
-                if (favoritesListWidget != null)
-                    favoritesListWidget.updateSearch();
+                FavoritesEntriesManager.INSTANCE.add(favoriteEntry);
                 return true;
             }
         }
@@ -876,12 +872,7 @@ public class ScreenOverlayImpl extends ScreenOverlay {
                 return ViewSearchBuilder.builder().addUsagesFor(stack).open();
             } else if (visible && ConfigObject.getInstance().getFavoriteKeyCode().matchesMouse(button)) {
                 FavoriteEntry favoriteEntry = FavoriteEntry.fromEntryStack(stack);
-                ConfigObject.getInstance().getFavoriteEntries().remove(favoriteEntry);
-                ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
-                ConfigManager.getInstance().saveConfig();
-                FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
-                if (favoritesListWidget != null)
-                    favoritesListWidget.updateSearch();
+                FavoritesEntriesManager.INSTANCE.add(favoriteEntry);
                 return true;
             }
         }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
index 90bad862f..2b5809e86 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
@@ -25,6 +25,7 @@ package me.shedaniel.rei.impl.client.gui.screen;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.math.Matrix4f;
 import dev.architectury.fluid.FluidStack;
 import me.shedaniel.math.Rectangle;
@@ -252,7 +253,7 @@ public abstract class AbstractDisplayViewingScreen extends Screen implements Dis
             public int getHeight() {
                 int entrySize = EntryListWidget.entrySize();
                 int w = Math.max(1, MAX_WIDTH / entrySize);
-                int height = Mth.ceil(widget.getEntries().size() / (float) w) * entrySize + 2;
+                int height = Math.min(6, Mth.ceil(widget.getEntries().size() / (float) w)) * entrySize + 2;
                 height += 12;
                 if (widget.tagMatch != null) height += 12;
                 return height;
@@ -279,8 +280,16 @@ public abstract class AbstractDisplayViewingScreen extends Screen implements Dis
                 for (EntryStack<?> entry : widget.getEntries()) {
                     int x1 = x + (i % w) * entrySize;
                     int y1 = y + 13 + (i / w) * entrySize;
-                    entry.render(poses, new Rectangle(x1, y1, entrySize, entrySize), -1000, -1000, 0);
                     i++;
+                    if (i / w > 5) {
+                        MultiBufferSource.BufferSource source = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+                        Component text = Component.literal("+" + (widget.getEntries().size() - w * 6 + 1)).withStyle(ChatFormatting.GRAY);
+                        font.drawInBatch(text, x1 + entrySize / 2 - font.width(text) / 2, y1 + entrySize / 2 - 1, -1, true, poses.last().pose(), source, false, 0, 15728880);
+                        source.endBatch();
+                        break;
+                    } else {
+                        entry.render(poses, new Rectangle(x1, y1, entrySize, entrySize), -1000, -1000, 0);
+                    }
                 }
                 poses.popPose();
             }
@@ -295,7 +304,7 @@ public abstract class AbstractDisplayViewingScreen extends Screen implements Dis
                     int w = Math.max(1, MAX_WIDTH / entrySize);
                     font.drawInBatch(Component.translatable("text.rei.tag_accept", widget.tagMatch.toString())
                                     .withStyle(ChatFormatting.GRAY),
-                            x, y + 16 + Mth.ceil(widget.getEntries().size() / (float) entrySize) * entrySize,
+                            x, y + 16 + Math.min(6, Mth.ceil(widget.getEntries().size() / (float) w)) * entrySize,
                             -1, true, pose, buffers, false, 0, 15728880);
                 }
             }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/AutoCraftingEvaluator.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/AutoCraftingEvaluator.java
index b9658ff55..a56666c9c 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/AutoCraftingEvaluator.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/AutoCraftingEvaluator.java
@@ -94,6 +94,7 @@ public class AutoCraftingEvaluator {
         }
         
         List<TransferHandler.Result> errors = new ArrayList<>();
+        TransferHandler.Result successfulResult = null;
         TransferHandler.Context context = TransferHandler.Context.create(actuallyCrafting, stackedCrafting, containerScreen, display);
         
         for (TransferHandler transferHandler : TransferHandlerRegistry.getInstance()) {
@@ -125,6 +126,7 @@ public class AutoCraftingEvaluator {
                     
                     if (transferResult.isSuccessful()) {
                         errors.clear();
+                        successfulResult = transferResult;
                         result.successful = true;
                         result.successfulHandler = transferHandler;
                         break;
@@ -150,6 +152,10 @@ public class AutoCraftingEvaluator {
         if (errors.isEmpty()) {
             errorTooltip.clear();
             errorTooltip.add(Component.translatable("text.auto_craft.move_items"));
+            
+            if (successfulResult != null) {
+                successfulResult.fillTooltip(errorTooltip);
+            }
         } else {
             errorTooltip.clear();
             List<Component> tooltipsFilled = new ArrayList<>();
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
index 61f915bf1..9bc1b55c4 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
@@ -52,6 +52,7 @@ import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.plugins.PluginManager;
 import me.shedaniel.rei.impl.client.REIRuntimeImpl;
 import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
+import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesEntriesManager;
 import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesListWidget;
 import me.shedaniel.rei.impl.client.view.ViewsImpl;
 import net.minecraft.ChatFormatting;
@@ -430,6 +431,24 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
             }
         }
         
+        if (tooltip != null) {
+            if (interactableFavorites && ConfigObject.getInstance().doDisplayFavoritesTooltip() && !ConfigObject.getInstance().getFavoriteKeyCode().isUnknown()) {
+                String name = ConfigObject.getInstance().getFavoriteKeyCode().getLocalizedName().getString();
+                if (reverseFavoritesAction())
+                    tooltip.addAllTexts(Stream.of(I18n.get("text.rei.remove_favorites_tooltip", name).split("\n"))
+                            .map(TextComponent::new).collect(Collectors.toList()));
+                else
+                    tooltip.addAllTexts(Stream.of(I18n.get("text.rei.favorites_tooltip", name).split("\n"))
+                            .map(TextComponent::new).collect(Collectors.toList()));
+            }
+            
+            if (tooltipProcessors != null) {
+                for (UnaryOperator<Tooltip> processor : tooltipProcessors) {
+                    tooltip = processor.apply(tooltip);
+                }
+            }
+        }
+        
         return tooltip;
     }
     
@@ -510,11 +529,10 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
             if (keyCode.matchesMouse(button)) {
                 FavoriteEntry favoriteEntry = asFavoriteEntry();
                 if (favoriteEntry != null) {
-                    if (reverseFavoritesAction())
-                        ConfigObject.getInstance().getFavoriteEntries().remove(favoriteEntry);
-                    else {
-                        ConfigObject.getInstance().getFavoriteEntries().remove(favoriteEntry);
-                        ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
+                    if (reverseFavoritesAction()) {
+                        FavoritesEntriesManager.INSTANCE.remove(favoriteEntry);
+                    } else {
+                        FavoritesEntriesManager.INSTANCE.add(favoriteEntry);
                     }
                     ConfigManager.getInstance().saveConfig();
                     FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
@@ -593,11 +611,10 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
             if (ConfigObject.getInstance().getFavoriteKeyCode().matchesKey(keyCode, scanCode)) {
                 FavoriteEntry favoriteEntry = asFavoriteEntry();
                 if (favoriteEntry != null) {
-                    if (reverseFavoritesAction())
-                        ConfigObject.getInstance().getFavoriteEntries().remove(favoriteEntry);
-                    else {
-                        ConfigObject.getInstance().getFavoriteEntries().remove(favoriteEntry);
-                        ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
+                    if (reverseFavoritesAction()) {
+                        FavoritesEntriesManager.INSTANCE.remove(favoriteEntry);
+                    } else {
+                        FavoritesEntriesManager.INSTANCE.add(favoriteEntry);
                     }
                     ConfigManager.getInstance().saveConfig();
                     FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java
new file mode 100644
index 000000000..c235e29ca
--- /dev/null
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java
@@ -0,0 +1,119 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022 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.impl.client.gui.widget.favorites;
+
+import me.shedaniel.rei.api.client.config.ConfigManager;
+import me.shedaniel.rei.api.client.favorites.FavoriteEntry;
+import me.shedaniel.rei.api.client.favorites.FavoriteEntryType;
+import me.shedaniel.rei.api.common.util.CollectionUtils;
+import me.shedaniel.rei.impl.client.config.ConfigManagerImpl;
+import me.shedaniel.rei.impl.client.config.ConfigObjectImpl;
+import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public class FavoritesEntriesManager {
+    public static final FavoritesEntriesManager INSTANCE = new FavoritesEntriesManager();
+    
+    private Stream<FavoriteEntry> getDefaultFavorites() {
+        return StreamSupport.stream(FavoriteEntryType.registry().sections().spliterator(), false)
+                .flatMap(section -> section.getDefaultEntries().stream());
+    }
+    
+    public List<FavoriteEntry> getFavorites() {
+        ConfigObjectImpl config = ConfigManagerImpl.getInstance().getConfig();
+        List<FavoriteEntry> defaultFavorites = getDefaultFavorites().collect(Collectors.toList());
+        defaultFavorites.removeAll(config.getHiddenFavoriteEntries());
+        
+        List<FavoriteEntry> favorites = new ArrayList<>(config.getFavoriteEntries());
+        defaultFavorites.removeAll(favorites);
+        favorites.addAll(0, defaultFavorites);
+        favorites.removeIf(FavoriteEntry::isInvalid);
+        return favorites;
+    }
+    
+    public void remove(FavoriteEntry entry) {
+        ConfigObjectImpl config = ConfigManagerImpl.getInstance().getConfig();
+        
+        config.getFavoriteEntries().remove(entry);
+        if (getDefaultFavorites().anyMatch(e -> e.equals(entry)) && !config.getHiddenFavoriteEntries().contains(entry)) {
+            config.getHiddenFavoriteEntries().add(entry);
+        }
+        
+        ConfigManager.getInstance().saveConfig();
+        FavoritesListWidget widget = ScreenOverlayImpl.getFavoritesListWidget();
+        if (widget != null) {
+            widget.updateSearch();
+        }
+    }
+    
+    public void add(FavoriteEntry entry) {
+        ConfigObjectImpl config = ConfigManagerImpl.getInstance().getConfig();
+        List<FavoriteEntry> defaultFavorites = getDefaultFavorites().toList();
+        
+        config.getFavoriteEntries().remove(entry);
+        if (CollectionUtils.anyMatch(defaultFavorites, e -> e.equals(entry)) && !config.getHiddenFavoriteEntries().contains(entry)) {
+            config.getHiddenFavoriteEntries().add(entry);
+        }
+        
+        for (int i = defaultFavorites.size() - 1; i >= 0; i--) {
+            FavoriteEntry e = defaultFavorites.get(i);
+            if (!config.getFavoriteEntries().contains(e) && !config.getHiddenFavoriteEntries().contains(e)) {
+                config.getFavoriteEntries().add(0, e);
+            }
+        }
+        
+        config.getHiddenFavoriteEntries().remove(entry);
+        if (!CollectionUtils.anyMatch(defaultFavorites, e -> e.equals(entry))) {
+            config.getFavoriteEntries().add(entry);
+        }
+        
+        ConfigManager.getInstance().saveConfig();
+        FavoritesListWidget widget = ScreenOverlayImpl.getFavoritesListWidget();
+        if (widget != null) {
+            widget.updateSearch();
+        }
+    }
+    
+    public void setEntries(List<FavoriteEntry> entries) {
+        List<FavoriteEntry> defaultFavorites = getDefaultFavorites().collect(Collectors.toList());
+        List<FavoriteEntry> hiddenDefaultFavorites = new ArrayList<>(defaultFavorites);
+        hiddenDefaultFavorites.removeAll(entries);
+        ConfigObjectImpl config = ConfigManagerImpl.getInstance().getConfig();
+        config.getHiddenFavoriteEntries().clear();
+        config.getHiddenFavoriteEntries().addAll(hiddenDefaultFavorites);
+        config.getFavoriteEntries().clear();
+        config.getFavoriteEntries().addAll(entries);
+        
+        ConfigManager.getInstance().saveConfig();
+        FavoritesListWidget widget = ScreenOverlayImpl.getFavoritesListWidget();
+        if (widget != null) {
+            widget.updateSearch();
+        }
+    }
+}
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesListWidget.java
index dc486b3ac..d77bd67d9 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesListWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesListWidget.java
@@ -281,7 +281,7 @@ public class FavoritesListWidget extends WidgetWithBounds implements DraggableCo
     
     public void updateSearch() {
         if (ConfigObject.getInstance().isFavoritesEnabled()) {
-            region.setEntries(CollectionUtils.map(ConfigObject.getInstance().getFavoriteEntries(), FavoriteEntry::copy), EntryStacksRegionWidget.RemovalMode.DISAPPEAR);
+            region.setEntries(CollectionUtils.map(FavoritesEntriesManager.INSTANCE.getFavorites(), FavoriteEntry::copy), EntryStacksRegionWidget.RemovalMode.DISAPPEAR);
         } else region.setEntries(Collections.emptyList(), EntryStacksRegionWidget.RemovalMode.DISAPPEAR);
     }
     
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/listeners/FavoritesRegionListener.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/listeners/FavoritesRegionListener.java
index 96d1de8c7..ef9a4837f 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/listeners/FavoritesRegionListener.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/listeners/FavoritesRegionListener.java
@@ -28,6 +28,7 @@ import me.shedaniel.rei.api.client.config.ConfigObject;
 import me.shedaniel.rei.api.client.favorites.FavoriteEntry;
 import me.shedaniel.rei.api.client.gui.drag.DraggableStack;
 import me.shedaniel.rei.api.client.gui.drag.DraggingContext;
+import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesEntriesManager;
 import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesListWidget;
 import me.shedaniel.rei.impl.client.gui.widget.region.RealRegionEntry;
 import me.shedaniel.rei.impl.client.gui.widget.region.RegionEntryWidget;
@@ -37,6 +38,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class FavoritesRegionListener implements RegionListener<FavoriteEntry> {
@@ -47,22 +49,14 @@ public class FavoritesRegionListener implements RegionListener<FavoriteEntry> {
     @Override
     public void onDrop(Stream<FavoriteEntry> entries) {
         if (ConfigObject.getInstance().isFavoritesEnabled()) {
-            List<FavoriteEntry> favorites = ConfigObject.getInstance().getFavoriteEntries();
-            favorites.clear();
-            entries.forEach(entry -> {
-                favorites.add(entry.copy());
-            });
-            
-            ConfigManager.getInstance().saveConfig();
+            FavoritesEntriesManager.INSTANCE.setEntries(entries.collect(Collectors.toList()));
         }
     }
     
     @Override
     public void onRemove(RealRegionEntry<FavoriteEntry> entry) {
         if (ConfigObject.getInstance().isFavoritesEnabled()) {
-            List<FavoriteEntry> favorites = ConfigObject.getInstance().getFavoriteEntries();
-            favorites.removeIf(favoriteEntry -> Objects.equals(entry.getEntry(), favoriteEntry));
-            ConfigManager.getInstance().saveConfig();
+            FavoritesEntriesManager.INSTANCE.remove(entry.getEntry());
         }
     }