From 995b8b58aa8c890c9181ae479e12a4facfa05a25 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 25 Mar 2021 03:55:36 +0800
Subject: Relocate most of the internal classes to match the api

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java')

diff --git a/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java b/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java
index 8195401da..1daaa568d 100644
--- a/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java
+++ b/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java
@@ -27,10 +27,10 @@ import com.google.gson.JsonObject;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.ClientHelper;
+import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer;
 import me.shedaniel.rei.api.client.favorites.FavoriteEntry;
 import me.shedaniel.rei.api.client.gui.DrawableConsumer;
 import me.shedaniel.rei.api.client.gui.widgets.*;
-import me.shedaniel.rei.api.client.ingredient.entry.renderer.EntryRenderer;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.screen.ClickArea;
 import me.shedaniel.rei.api.client.view.ViewSearchBuilder;
@@ -70,10 +70,14 @@ public final class ClientInternals {
     
     @ApiStatus.Internal
     public static <T> void attachInstance(T instance, Class<T> clazz) {
-        attachInstance((Supplier<T>) () -> instance, clazz.getSimpleName());
+        attachInstanceSupplier(instance, clazz.getSimpleName());
     }
     
     @ApiStatus.Internal
+    public static <T> void attachInstanceSupplier(T instance, String name) {
+        attachInstance((Supplier<T>) () -> instance, name);
+    }
+    
     public static <T> void attachInstance(T instance, String name) {
         try {
             for (Field field : ClientInternals.class.getDeclaredFields()) {
-- 
cgit