Update ModSorter.java

neoforged · Dec 14, 2023 · bf68c98 · bf68c98
1 parent 5ad65bf
commit bf68c98
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/loader/src/main/java/net/neoforged/fml/loading/ModSorter.java b/loader/src/main/java/net/neoforged/fml/loading/ModSorter.java
@@ -56,8 +56,6 @@ public static LoadingModList sort(List<ModFile> mods, final List<EarlyLoadingExc
         // try and validate dependencies
         final DependencyResolutionResult resolutionResult = ms.verifyDependencyVersions();
 
-        final List<EarlyLoadingException.ExceptionData> warnings = new ArrayList<>();
-
         final LoadingModList list;
 
         // if we miss a dependency or detect an incompatibility, we abort now
@@ -203,10 +201,12 @@ public record DependencyResolutionResult(
             Map<String, ArtifactVersion> modVersions
     ) {
         public List<EarlyLoadingException.ExceptionData> buildWarningMessages() {
-            return conflicts.stream()
+            return Stream.concat(conflicts.stream()
                     .map(mv -> new EarlyLoadingException.ExceptionData("fml.modloading.conflictingmod",
                             mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
-                            modVersions.get(mv.getModId()), mv.getReason().orElse("fml.modloading.conflictingmod.noreason")))
+                            modVersions.get(mv.getModId()), mv.getReason().orElse("fml.modloading.conflictingmod.noreason"))),
+
+                        Stream.of(new EarlyLoadingException.ExceptionData("fml.modloading.conflictingmod.proceed")))
                     .toList();
         }