aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/java/me/shedaniel/rei/plugin/client
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2023-10-23 21:54:28 +0800
committershedaniel <daniel@shedaniel.me>2023-10-23 21:54:28 +0800
commit120e6ea190a342e367e7c26b77d22b057091af84 (patch)
treeb214b8cf1d24b06ea32e925824af0ea4b7ea7954 /runtime/src/main/java/me/shedaniel/rei/plugin/client
parent67d12db3f28127232ffe8e02957076f210c5cc92 (diff)
parent11278f48effaa9a7ccc212ce0a047e356d9c4859 (diff)
downloadRoughlyEnoughItems-120e6ea190a342e367e7c26b77d22b057091af84.tar.gz
RoughlyEnoughItems-120e6ea190a342e367e7c26b77d22b057091af84.tar.bz2
RoughlyEnoughItems-120e6ea190a342e367e7c26b77d22b057091af84.zip
Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin/client')
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
index dddd4594a..ad505b839 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
@@ -61,7 +61,7 @@ import me.shedaniel.rei.impl.client.search.method.DefaultInputMethod;
import me.shedaniel.rei.impl.client.search.method.unihan.*;
import me.shedaniel.rei.impl.common.entry.type.EntryRegistryImpl;
import me.shedaniel.rei.impl.common.entry.type.EntryRegistryListener;
-import me.shedaniel.rei.impl.common.util.HashedEntryStackWrapper;
+import me.shedaniel.rei.impl.common.util.HNEntryStackWrapper;
import me.shedaniel.rei.plugin.autocrafting.DefaultCategoryHandler;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@@ -116,7 +116,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
((EntryRegistryImpl) registry).listeners.add(new EntryRegistryListener() {
@Override
- public void onReFilter(List<HashedEntryStackWrapper> stacks) {
+ public void onReFilter(List<HNEntryStackWrapper> stacks) {
filteredStacksVisibilityHandler.reset();
}
});