Update to 1.21.2 (Please read Primer)

https://hackmd.io/@shedaniel/rei17_primer

2 files changed, 3 insertions, 14 deletions

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 b366ee2ef..98263245d 100644
--- a/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java
+++ b/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java
@@ -56,7 +56,6 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import org.apache.commons.io.function.IOQuadFunction;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
@@ -198,8 +197,6 @@ public final class ClientInternals {
     
     @Environment(EnvType.CLIENT)
     public interface WidgetsProvider {
-        boolean isRenderingPanel(Panel panel);
-        
         Widget wrapVanillaWidget(GuiEventListener element);
         
         WidgetWithBounds wrapRenderer(Supplier<Rectangle> bounds, Renderer renderer);
diff --git a/api/src/main/java/me/shedaniel/rei/impl/Internals.java b/api/src/main/java/me/shedaniel/rei/impl/Internals.java
index d083a3183..bdf7e6d2f 100644
--- a/api/src/main/java/me/shedaniel/rei/impl/Internals.java
+++ b/api/src/main/java/me/shedaniel/rei/impl/Internals.java
@@ -31,9 +31,7 @@ import me.shedaniel.rei.api.common.entry.comparison.EntryComparator;
 import me.shedaniel.rei.api.common.entry.type.EntryDefinition;
 import me.shedaniel.rei.api.common.entry.type.EntryType;
 import me.shedaniel.rei.api.common.plugins.PluginManager;
-import me.shedaniel.rei.api.common.plugins.REIPlugin;
-import me.shedaniel.rei.api.common.plugins.REIServerPlugin;
-import me.shedaniel.rei.api.common.transfer.info.MenuInfoRegistry;
+import me.shedaniel.rei.api.common.plugins.REICommonPlugin;
 import me.shedaniel.rei.impl.common.InternalLogger;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.component.DataComponentMap;
@@ -51,11 +49,9 @@ public final class Internals {
     private static Supplier<EntryStackProvider> entryStackProvider = Internals::throwNotSetup;
     private static Supplier<EntryIngredientProvider> entryIngredientProvider = Internals::throwNotSetup;
     private static Function<ResourceLocation, EntryType<?>> entryTypeDeferred = (object) -> throwNotSetup();
-    private static Supplier<PluginManager<REIPlugin<?>>> commonPluginManager = Internals::throwNotSetup;
-    private static Supplier<PluginManager<REIServerPlugin>> serverPluginManager = Internals::throwNotSetup;
+    private static Supplier<PluginManager<REICommonPlugin>> commonPluginManager = Internals::throwNotSetup;
     private static Supplier<NbtHasherProvider> nbtHasherProvider = Internals::throwNotSetup;
     private static Function<String, CategoryIdentifier<?>> categoryIdentifier = (object) -> throwNotSetup();
-    private static Supplier<MenuInfoRegistry> stubMenuInfoRegistry = Internals::throwNotSetup;
     private static Supplier<InternalLogger> logger = Internals::throwNotSetup;
     private static Supplier<RegistryAccess> registryAccess = Internals::throwNotSetup;
     
@@ -100,14 +96,10 @@ public final class Internals {
         return entryTypeDeferred.apply(id);
     }
     
-    public static PluginManager<REIPlugin<?>> getPluginManager() {
+    public static PluginManager<REICommonPlugin> getPluginManager() {
         return commonPluginManager.get();
     }
     
-    public static PluginManager<REIServerPlugin> getServerPluginManager() {
-        return serverPluginManager.get();
-    }
-    
     public static EntryComparator<DataComponentMap> getComponentHasher(DataComponentType<?>[] ignoredKeys) {
         return nbtHasherProvider.get().provide(ignoredKeys);
     }