diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-10-24 10:37:07 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 00:38:18 +0900 |
| commit | 881f8d146f15c2dfbe1292747f933d3c19cb429a (patch) | |
| tree | 48093729170a4e74b682ec3c0e9dd703d4c78c0b /runtime | |
| parent | ea618dbde55b640576c364086bb789bd06563974 (diff) | |
| download | RoughlyEnoughItems-881f8d146f15c2dfbe1292747f933d3c19cb429a.tar.gz RoughlyEnoughItems-881f8d146f15c2dfbe1292747f933d3c19cb429a.tar.bz2 RoughlyEnoughItems-881f8d146f15c2dfbe1292747f933d3c19cb429a.zip | |
Fix compile issues after rebase
Diffstat (limited to 'runtime')
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 cb162fba4..b7ba99339 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 @@ -470,7 +470,7 @@ public class ConfigManagerImpl implements ConfigManager { 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.InternalLogger; 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(); |
