Merge remote-tracking branch 'upstream/main' into junit

earlydisplay/build.gradle

@@ -15,7 +15,6 @@ switch (OperatingSystem.current()) {
 dependencies {
 
     implementation(project(':loader'))
-    implementation(project(':core'))
 
     compileOnly("org.jetbrains:annotations:${jetbrains_annotations_version}")
     implementation("org.lwjgl:lwjgl:${lwjgl_version}")
@@ -35,4 +34,4 @@ dependencies {
     testRuntimeOnly("org.lwjgl:lwjgl-glfw::${lwjglNatives}")
     testRuntimeOnly("org.lwjgl:lwjgl-opengl::${lwjglNatives}")
     testRuntimeOnly("org.lwjgl:lwjgl-stb::${lwjglNatives}")
-}
+}

gradle.properties

@@ -1,4 +1,3 @@
-spi_version=9.0.1
 mergetool_version=2.0.0
 accesstransformers_version=10.0.1
 coremods_version=6.0.0

loader/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     api("org.ow2.asm:asm:${asm_version}")
     api("org.ow2.asm:asm-tree:${asm_version}")
     api("org.ow2.asm:asm-commons:${asm_version}")
-    api("net.neoforged:neoforgespi:${spi_version}")
+    api(project(':spi'))
     api("net.neoforged:mergetool:${mergetool_version}:api")
     api("org.apache.logging.log4j:log4j-api:${log4j_version}")
     api("org.slf4j:slf4j-api:${slf4j_api_version}")
@@ -19,6 +19,7 @@ dependencies {
     api("com.mojang:logging:${mojang_logging_version}")
     api "net.neoforged:JarJarSelector:${jarjar_version}"
     api "net.neoforged:JarJarMetadata:${jarjar_version}"
+    api("net.neoforged:bus:${eventbus_version}")
 
     implementation("net.sf.jopt-simple:jopt-simple:${jopt_simple_version}")
     implementation("cpw.mods:securejarhandler:${securejarhandler_version}")
@@ -28,6 +29,7 @@ dependencies {
     }
     implementation("org.spongepowered:mixin:${mixin_version}")
     implementation("net.minecrell:terminalconsoleappender:${terminalconsoleappender_version}")
+    implementation("commons-io:commons-io:${commons_io_version}")
 
     implementation("org.apache.logging.log4j:log4j-core:${log4j_version}")
     annotationProcessor("org.apache.logging.log4j:log4j-core:${log4j_version}")

core/src/main/java/net/neoforged/fml/ModContainer.java → loader/src/main/java/net/neoforged/fml/ModContainer.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import static net.neoforged.fml.Logging.LOADING;

core/src/main/java/net/neoforged/fml/ModLoader.java → loader/src/main/java/net/neoforged/fml/ModLoader.java

@@ -100,6 +100,11 @@ private ModLoader()
         this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream()
                 .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
                 .collect(Collectors.toList());
+
+        FMLLoader.getLoadingModList().getWarnings().stream()
+                .flatMap(ModLoadingWarning::fromEarlyException)
+                .forEach(this.loadingWarnings::add);
+
         FMLLoader.getLoadingModList().getModFiles().stream()
                 .filter(ModFileInfo::missingLicense)
                 .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error

core/src/main/java/net/neoforged/fml/ModLoadingWarning.java → loader/src/main/java/net/neoforged/fml/ModLoadingWarning.java

@@ -6,6 +6,7 @@
 package net.neoforged.fml;
 
 import com.google.common.collect.Streams;
+import net.neoforged.fml.loading.EarlyLoadingException;
 import net.neoforged.neoforgespi.language.IModInfo;
 
 import java.util.Arrays;
@@ -43,4 +44,8 @@ public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningSt
     public String formatToString() {
         return Bindings.getMessageParser().get().parseMessage(i18nMessage, Streams.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
     }
+
+    static Stream<ModLoadingWarning> fromEarlyException(final EarlyLoadingException e) {
+        return e.getAllData().stream().map(ed->new ModLoadingWarning(ed.getModInfo(), ModLoadingStage.VALIDATE, ed.getI18message(), ed.getArgs()));
+    }
 }