Look in the SERVICE layer for ImmediateWindowProvider implementations

neoforged · Feb 23, 2024 · 8d26fa6 · 8d26fa6
1 parent 9b239e3
commit 8d26fa6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/loader/src/main/java/net/neoforged/fml/loading/ImmediateWindowHandler.java b/loader/src/main/java/net/neoforged/fml/loading/ImmediateWindowHandler.java
@@ -5,6 +5,8 @@
 
 package net.neoforged.fml.loading;
 
+import cpw.mods.modlauncher.Launcher;
+import cpw.mods.modlauncher.api.IModuleLayerManager.Layer;
 import net.neoforged.fml.loading.progress.ProgressMeter;
 import net.neoforged.fml.loading.progress.StartupNotificationManager;
 import org.apache.logging.log4j.LogManager;
@@ -32,7 +34,10 @@ public static void load(final String launchTarget, final String[] arguments) {
         } else {
             final var providername = FMLConfig.getConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER);
             LOGGER.info("Loading ImmediateWindowProvider {}", providername);
-            final var maybeProvider = ServiceLoader.load(ImmediateWindowProvider.class)
+            final var layer = Launcher.INSTANCE.findLayerManager()
+                    .flatMap(manager -> manager.getLayer(Layer.SERVICE))
+                    .orElse(ImmediateWindowHandler.class.getModule().getLayer()); // This will likely be the BOOT layer, but is a sensible fallback.
+            final var maybeProvider = ServiceLoader.load(layer, ImmediateWindowProvider.class)
                     .stream()
                     .map(ServiceLoader.Provider::get)
                     .filter(p -> Objects.equals(p.name(), providername))