From ddb48e2032d1986709cad973067693eec3118504 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 26 Oct 2024 16:55:52 +0800 Subject: Update to 1.21.2 (Please read Primer) https://hackmd.io/@shedaniel/rei17_primer --- api/src/main/java/me/shedaniel/rei/impl/Internals.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'api/src/main/java/me/shedaniel/rei/impl/Internals.java') 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 = Internals::throwNotSetup; private static Supplier entryIngredientProvider = Internals::throwNotSetup; private static Function> entryTypeDeferred = (object) -> throwNotSetup(); - private static Supplier>> commonPluginManager = Internals::throwNotSetup; - private static Supplier> serverPluginManager = Internals::throwNotSetup; + private static Supplier> commonPluginManager = Internals::throwNotSetup; private static Supplier nbtHasherProvider = Internals::throwNotSetup; private static Function> categoryIdentifier = (object) -> throwNotSetup(); - private static Supplier stubMenuInfoRegistry = Internals::throwNotSetup; private static Supplier logger = Internals::throwNotSetup; private static Supplier registryAccess = Internals::throwNotSetup; @@ -100,14 +96,10 @@ public final class Internals { return entryTypeDeferred.apply(id); } - public static PluginManager> getPluginManager() { + public static PluginManager getPluginManager() { return commonPluginManager.get(); } - public static PluginManager getServerPluginManager() { - return serverPluginManager.get(); - } - public static EntryComparator getComponentHasher(DataComponentType[] ignoredKeys) { return nbtHasherProvider.get().provide(ignoredKeys); } -- cgit