Fix non-core mixin mods handling

CleanroomMC · Apr 30, 2024 · f194d7f · f194d7f
1 parent 57f95db
commit f194d7f
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java b/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
@@ -448,21 +448,19 @@ private static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader)
                 classLoader.addURL(coreMod.toURI().toURL());
                 if (configs != null && !MixinServiceLaunchWrapper.MIXIN_TWEAKER_CLASS.equals(cascadedTweaker))
                     Mixins.addConfigurations(configs.split(","));
-                if (!mfAttributes.containsKey(COREMODCONTAINSFMLMOD))
-                {
-                    FMLLog.log.trace("Adding {} to the list of known coremods, it will not be examined again", coreMod.getName());
-                    ignoredModFiles.add(coreMod.getName());
-                }
-                else if (fmlCorePlugin != null)
-                {
-                    FMLLog.log.info("Found FMLCorePluginContainsFMLMod marker in {}.",
+                if (fmlCorePlugin == null) {
+                    FMLLog.log.info("Found Mixin configs in non-coremod {}. Adding it to @Mod candidate list.",
                             coreMod.getName());
                     candidateModFiles.add(coreMod.getName());
+                    continue;
+                } else if (!mfAttributes.containsKey(COREMODCONTAINSFMLMOD)) {
+                    FMLLog.log.trace("Adding {} to the list of known coremods, it will not be examined again",
+                            coreMod.getName());
+                    ignoredModFiles.add(coreMod.getName());
                 } else {
-                    FMLLog.log.info("Found Mixin configs in non-coremod {}. Adding it to @Mod candidate list.",
+                    FMLLog.log.info("Found FMLCorePluginContainsFMLMod marker in {}.",
                             coreMod.getName());
                     candidateModFiles.add(coreMod.getName());
-                    continue;
                 }
             }
             catch (MalformedURLException e)