From 99d2202b77e808daf2c2023c32d9f6ee9d371e7b Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 1 Jun 2023 17:23:41 +0800 Subject: Fix merge conflicts --- .../rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java | 6 ------ .../impl/client/gui/widget/entrylist/EntryListSearchManager.java | 4 ++-- .../rei/impl/client/search/collapsed/CollapsedEntriesCache.java | 1 - .../me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java | 2 +- .../me/shedaniel/rei/impl/common/entry/type/FilteredEntryList.java | 4 +--- .../common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java | 4 ++-- 6 files changed, 6 insertions(+), 15 deletions(-) (limited to 'runtime/src') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java index f45c6927d..d3ff9597d 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java @@ -66,7 +66,6 @@ public class UncertainDisplayViewingScreen extends Screen { private BooleanConsumer callback; private Button button; private Screen parent; - private Widget slider; private boolean showTips; public UncertainDisplayViewingScreen(Screen parent, DisplayScreenType type, boolean showTips, BooleanConsumer callback) { @@ -186,11 +185,6 @@ public class UncertainDisplayViewingScreen extends Screen { return super.keyPressed(int_1, int_2, int_3); } - @Override - public boolean mouseDragged(double d, double e, int i, double f, double g) { - return slider.mouseDragged(d, e, i, f, g) || super.mouseDragged(d, e, i, f, g); - } - public class ScreenTypeSelection extends WidgetWithBounds { private final DisplayScreenType type; private Rectangle bounds; 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 7626c8fa4..c3d3d6e93 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 @@ -80,13 +80,13 @@ public class EntryListSearchManager { return checkCraftable ? stack -> workingItems.contains(stack.hashExact()) : stack -> true; }, HashedEntryStackWrapper::normalize); - private static List> getAllEntriesContextually(SearchFilter filter) { + private static List getAllEntriesContextually(SearchFilter filter) { if (EntryRegistry.getInstance().isReloading()) return List.of(); if (ConfigObject.getInstance().isHidingEntryPanelIfIdle() && filter.getFilter().isEmpty()) { return List.of(); } - return EntryRegistry.getInstance().getPreFilteredList(); + return ((EntryRegistryImpl) EntryRegistry.getInstance()).getPreFilteredComplexList(); } public void update(String searchTerm, boolean ignoreLastSearch, Consumer | CollapsedStack*/ Object>> update) { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java index 2f87b2295..a95fe59fc 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java @@ -55,7 +55,6 @@ public class CollapsedEntriesCache { Collection entries = ((CollapsibleEntryRegistryImpl) CollapsibleEntryRegistry.getInstance()).getEntries(); InternalLogger.getInstance().debug("Preparing collapsed entry groups cache with %d entries and %d stacks", entries.size(), stacks.size()); - List> futures = Lists.newArrayList(); for (CollapsibleEntryRegistryImpl.Entry entry : entries) { if (entry.canCache()) { for (HashedEntryStackWrapper stack : stacks) { 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 d285bec8d..bbe5ab555 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 @@ -126,7 +126,7 @@ public class EntryRegistryImpl implements EntryRegistry { } public List getPreFilteredComplexList() { - return Collections.unmodifiableList(filteredList.getComplexList()); + return Collections.unmodifiableList(filteredList.getList()); } public List getComplexList() { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/FilteredEntryList.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/FilteredEntryList.java index 6dea48816..b44c64f26 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/FilteredEntryList.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/FilteredEntryList.java @@ -38,11 +38,9 @@ public interface FilteredEntryList extends EntryRegistryListener { void refreshFilteringFor(boolean log, @Nullable Set> refilterRules, Collection> stacks, @Nullable LongCollection hashes); - List getList(); + List getList(); List> getUnwrappedList(); - List getComplexList(); - boolean isFiltered(EntryStack stack, long hashExact); } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java index fbb1428de..7069511ab 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java @@ -88,9 +88,9 @@ public class CollapsibleEntryRegistryImpl implements CollapsibleEntryRegistry { InternalLogger.getInstance().debug("Recollecting custom collapsible entry groups"); this.customEntries.clear(); for (CollapsibleConfigManager.CustomGroup customEntry : CollapsibleConfigManager.getInstance().getConfig().customGroups) { - List> stacks = CollectionUtils.filterAndMap(customEntry.stacks, EntryStackProvider::isValid, EntryStackProvider::provide); + List stacks = CollectionUtils.filterAndMap(customEntry.stacks, EntryStackProvider::isValid, provider -> new HashedEntryStackWrapper(provider.provide())); Entry entry = new Entry(customEntry.id, new TextComponent(customEntry.name), - new ListMatcher(stacks)); + new ListMatcher(stacks), false); this.customEntries.add(entry); InternalLogger.getInstance().debug("Added custom collapsible entry group [%s] %s with %d entries", entry.getId(), entry.getName().getString(), stacks.size()); } -- cgit