Add InputMethods, Close #574

5 files changed, 3 insertions, 18 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
index 24994570e..d67beed02 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
@@ -27,7 +27,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMaps;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
-import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.ClientHelper;
 import me.shedaniel.rei.api.client.gui.Renderer;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/settings/EntrySettingsAdapterRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/settings/EntrySettingsAdapterRegistryImpl.java
index d1ad332e8..9380f4b0b 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/settings/EntrySettingsAdapterRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/settings/EntrySettingsAdapterRegistryImpl.java
@@ -26,9 +26,6 @@ package me.shedaniel.rei.impl.common.entry.settings;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
-import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer;
-import me.shedaniel.rei.api.client.entry.renderer.EntryRendererProvider;
-import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.entry.settings.EntrySettingsAdapter;
 import me.shedaniel.rei.api.common.entry.settings.EntrySettingsAdapterRegistry;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/PreFilteredEntryList.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/PreFilteredEntryList.java
index 2a2cce586..3b0a73f3a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/PreFilteredEntryList.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/PreFilteredEntryList.java
@@ -27,18 +27,18 @@ import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.longs.LongList;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
+import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.config.ConfigObject;
 import me.shedaniel.rei.api.client.config.entry.EntryStackProvider;
+import me.shedaniel.rei.api.client.overlay.ScreenOverlay;
 import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
-import me.shedaniel.rei.impl.client.REIRuntimeImpl;
 import me.shedaniel.rei.impl.client.config.ConfigObjectImpl;
 import me.shedaniel.rei.impl.client.entry.filtering.FilteringCacheImpl;
 import me.shedaniel.rei.impl.client.entry.filtering.FilteringContextImpl;
 import me.shedaniel.rei.impl.client.entry.filtering.FilteringContextType;
 import me.shedaniel.rei.impl.client.entry.filtering.FilteringRule;
-import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
 import me.shedaniel.rei.impl.common.util.HashedEntryStackWrapper;
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.jetbrains.annotations.Nullable;
@@ -189,9 +189,7 @@ public class PreFilteredEntryList implements EntryRegistryListener {
     }
     
     private void queueSearchUpdate() {
-        if (REIRuntimeImpl.getSearchField() != null) {
-            ScreenOverlayImpl.getInstance().queueReloadSearch();
-        }
+        REIRuntime.getInstance().getOverlay().ifPresent(ScreenOverlay::queueReloadSearch);
     }
     
     public List<EntryStack<?>> getList() {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java
index 05dc9acba..122366ba9 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java
@@ -24,7 +24,6 @@
 package me.shedaniel.rei.impl.common.entry.type.types;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java
index 70c440cb4..59effd6ea 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java
@@ -24,16 +24,8 @@
 package me.shedaniel.rei.impl.common.logging;
 
 import me.shedaniel.rei.impl.common.InternalLogger;
-import org.apache.commons.io.output.NullOutputStream;
 import org.apache.logging.log4j.Level;
 
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
 public class FilteringLogger implements InternalLogger {
     private final InternalLogger logger;
     private final Level minLevel;