2 files changed, 7 insertions, 4 deletions
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
index 6ff2941bd..ff32d478e 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
@@ -62,6 +62,8 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import static me.shedaniel.rei.impl.Internals.attachInstance;
+
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Supplier;
@@ -260,8 +262,8 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
     @Override
     public void onInitializeClient() {
         ClientHelperImpl.instance = this;
-        RoughlyEnoughItemsCore.attachInstance(instance, ClientHelper.class);
-        RoughlyEnoughItemsCore.attachInstance((Supplier<ClientHelper.ViewSearchBuilder>) ViewSearchBuilder::new, "viewSearchBuilder");
+        attachInstance(instance, ClientHelper.class);
+        attachInstance((Supplier<ClientHelper.ViewSearchBuilder>) ViewSearchBuilder::new, "viewSearchBuilder");
         modNameCache.put("minecraft", "Minecraft");
         modNameCache.put("c", "Global");
         modNameCache.put("global", "Global");
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
index 018fb52eb..07cf9fcfc 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
@@ -30,7 +30,6 @@ import me.shedaniel.cloth.api.client.events.v0.ClothClientHooks;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.api.Executor;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.RoughlyEnoughItemsState;
 import me.shedaniel.rei.api.ConfigManager;
 import me.shedaniel.rei.api.ConfigObject;
@@ -60,6 +59,8 @@ import org.apache.logging.log4j.util.TriConsumer;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
+import static me.shedaniel.rei.impl.Internals.attachInstance;
+
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -220,7 +221,7 @@ public class ScreenHelper implements ClientModInitializer, REIHelper {
     
     public ScreenHelper() {
         ScreenHelper.instance = this;
-        RoughlyEnoughItemsCore.attachInstance(instance, REIHelper.class);
+        attachInstance(instance, REIHelper.class);
     }
     
     public static Rectangle getItemListArea(Rectangle bounds) {