From 3d9e12a71df6a6641c6422bf03cdfc550bab9097 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Wed, 5 Jun 2024 17:57:42 +0100 Subject: [PATCH] Cleanup FML Bindings (#10004) --- .../java/net/minecraftforge/fml/Bindings.java | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java b/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java index d7e9d073d5..52149f1a51 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java @@ -9,41 +9,35 @@ import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.config.IConfigEvent; import net.minecraftforge.fml.loading.FMLLoader; -import java.util.ArrayList; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; import java.util.function.Supplier; +/** + * Used to allow access to certain things from the game layer + */ public class Bindings { - private static final Bindings INSTANCE = new Bindings(); + private Bindings() {} - private final IBindingsProvider provider; - - private Bindings() { - var providers = new ArrayList(1); - for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) { - try { - providers.add(itr.next()); - } catch (ServiceConfigurationError sce) { - sce.printStackTrace(); - } - } - - if (providers.size() != 1) - throw new IllegalStateException("Could not find bindings provider: " + providers); - - this.provider = providers.get(0); - } + /** + * The provider of the bindings + * @implNote May also throw a {@link ServiceConfigurationError} + */ + private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class) + .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider")); + /** + * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS + */ public static Supplier getForgeBus() { - return INSTANCE.provider.getForgeBusSupplier(); + return PROVIDER.getForgeBusSupplier(); } public static Supplier getMessageParser() { - return INSTANCE.provider.getMessageParser(); + return PROVIDER.getMessageParser(); } public static Supplier getConfigConfiguration() { - return INSTANCE.provider.getConfigConfiguration(); + return PROVIDER.getConfigConfiguration(); } }