From 4b2f47f3169e4959f1d88e4a5b5249f4017b043a Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 24 Oct 2023 10:37:07 +0800
Subject: [PATCH] Fix compile issues after rebase

---
 .../me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java | 2 +-
 .../client/gui/widget/entrylist/EntryListSearchManager.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 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 5141dfe53..eb5ca3eaf 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
@@ -468,7 +468,7 @@ public boolean isEditable() {
                         public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
                             if (PluginManager.areAnyReloading()) {
                                 Screen screen = Minecraft.getInstance().screen;
-                                Minecraft.getInstance().setScreen(new ConfigReloadingScreen(new TranslatableComponent("text.rei.config.is.reloading"), PluginManager::areAnyReloading, () -> Minecraft.getInstance().setScreen(screen)));
+                                Minecraft.getInstance().setScreen(new ConfigReloadingScreen(new TranslatableComponent("text.rei.config.is.reloading"), PluginManager::areAnyReloading, () -> Minecraft.getInstance().setScreen(screen), null));
                             } else {
                                 super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
                             }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
index c3d3d6e93..d7f353a52 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
@@ -44,6 +44,7 @@
 import me.shedaniel.rei.impl.common.entry.type.EntryRegistryImpl;
 import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsedStack;
 import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsibleEntryRegistryImpl;
+import me.shedaniel.rei.impl.common.util.HNEntryStackWrapper;
 import me.shedaniel.rei.impl.common.util.HashedEntryStackWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
@@ -80,7 +81,7 @@ public class EntryListSearchManager {
         return checkCraftable ? stack -> workingItems.contains(stack.hashExact()) : stack -> true;
     }, HashedEntryStackWrapper::normalize);
     
-    private static List<HashedEntryStackWrapper> getAllEntriesContextually(SearchFilter filter) {
+    private static List<HNEntryStackWrapper> getAllEntriesContextually(SearchFilter filter) {
         if (EntryRegistry.getInstance().isReloading()) return List.of();
         if (ConfigObject.getInstance().isHidingEntryPanelIfIdle() && filter.getFilter().isEmpty()) {
             return List.of();