Bump NF, make test setup less brittle

build.gradle

@@ -1,3 +1,5 @@
+import java.util.stream.Collectors
+
 /*
  * This file is part of Applied Energistics 2.
  * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
@@ -173,7 +175,7 @@ dependencies {
     testImplementation("org.assertj:assertj-core:3.19.0")
     testImplementation("com.google.guava:guava-testlib:21.0")
     testImplementation("org.mockito:mockito-junit-jupiter:5.3.1")
-    testImplementation("cpw.mods:securejarhandler:2.1.20")
+//    testImplementation("cpw.mods:securejarhandler:2.1.20")
 
     compileOnly 'org.apache.commons:commons-configuration2:2.9.0'
 
@@ -254,21 +256,26 @@ test {
             }.collect(java.util.stream.Collectors.joining(File.pathSeparator))
     )
 
-    def fmlVersion = "2.0.1"
+    def fmlVersion = "2.0.4"
 
     environment("fmljunit.assetsDir", new File(gradle.gradleUserHomeDir, "caches/minecraft/assets/${minecraft_version}/").absolutePath)
     environment("fmljunit.neoForgeVersion", neoforge_version)
     environment("fmljunit.fmlVersion", fmlVersion)
     environment("fmljunit.mcVersion", minecraft_version)
     environment("fmljunit.neoFormVersion", neoFormRuntime.findIn(configurations.runtimeClasspath).first().specification.neoFormVersion)
-    println(neoFormRuntime.findIn(configurations.runtimeClasspath).first().specification.neoFormVersion)
 
     jvmArgumentProviders.add(new CommandLineArgumentProvider() {
         @Override
         Iterable<String> asArguments() {
-            return [
-                    "--module-path",
-                    test.classpath
+
+            // This includes the system properties
+            var runArgs = runs.getByName("client").realiseJvmArguments()
+            for (var i = 0; i < runArgs.size(); i++) {
+                var arg = runArgs.get(i);
+                if (arg.startsWith("-DlegacyClassPath.file=")) {
+                    runArgs.set(i, "-DlegacyClassPath.file=${project.rootDir.absolutePath}/build/test_classpath.txt")
+                } else if ((arg == "-p" || arg == "--module-path") && i + 1 < runArgs.size()) {
+                    runArgs.set(i + 1, test.classpath
                             .filter {
                                 it.name.contains("bootstraplauncher")
                                         || it.name.contains("securejarhandler")
@@ -281,8 +288,12 @@ test {
                                         || it.name.startsWith("assertj-")
                                         || it.name.startsWith("guava-testlib-")
                             }
-                            .join(File.pathSeparator)
-            ]
+                            .join(File.pathSeparator))
+                }
+            }
+            println(runArgs)
+
+            return runArgs
         }
     })
 
@@ -297,21 +308,21 @@ test {
         new File("$aeDir/build/test_classpath.txt").text = classPathLines.join("\n")
     }
 
-    jvmArgs = [
-            "-DignoreList=junit,securejarhandler,asm,asm-commons,asm-tree,asm-util,asm-analysis,bootstraplauncher,JarJarFileSystems,events-${fmlVersion}.jar,core-${fmlVersion}.jar,language-java,language-lowcode,language-minecraft,client-extra,neoforge-,mixinextras-",
-            "--add-modules",
-            "ALL-MODULE-PATH",
-            "--add-opens", "java.base/java.util.jar=cpw.mods.securejarhandler",
-            "--add-opens", "java.base/java.lang.invoke=cpw.mods.securejarhandler",
-            "--add-exports", "java.base/sun.security.util=cpw.mods.securejarhandler",
-            "--add-exports", "jdk.naming.dns/com.sun.jndi.dns=java.naming",
-            "-DlegacyClassPath.file=$aeDir/build/test_classpath.txt",
-            "-Dfml.gameLayerLibraries=events-${fmlVersion}.jar",
-            "-DignoreList=securejarhandler-2.1.24.jar,asm-9.5.jar,asm-commons-9.5.jar,asm-tree-9.5.jar,asm-util-9.5.jar,asm-analysis-9.5.jar,bootstraplauncher-1.1.2.jar,JarJarFileSystems-0.4.0.jar,events-2.0.1.jar,core-2.0.1.jar,language-java-2.0.1.jar,language-lowcode-2.0.1.jar,language-minecraft-2.0.1.jar,mixinextras-neoforge-0.3.2.jar,client-extra,neoforge-",
-            "-DmergeModules=jna-5.10.0.jar,jna-platform-5.10.0.jar",
-            "-Djava.net.preferIPv6Addresses=system",
-            "-Dfml.pluginLayerLibraries=core-${fmlVersion}.jar,language-java-${fmlVersion}.jar,language-lowcode-${fmlVersion}.jar,language-minecraft-${fmlVersion}.jar",
-    ]
+//    [
+//            "-DignoreList=junit,securejarhandler,asm,asm-commons,asm-tree,asm-util,asm-analysis,bootstraplauncher,JarJarFileSystems,events-${fmlVersion}.jar,core-${fmlVersion}.jar,language-java,language-lowcode,language-minecraft,client-extra,neoforge-,mixinextras-",
+//            "--add-modules",
+//            "ALL-MODULE-PATH",
+//            "--add-opens", "java.base/java.util.jar=cpw.mods.securejarhandler",
+//            "--add-opens", "java.base/java.lang.invoke=cpw.mods.securejarhandler",
+//            "--add-exports", "java.base/sun.security.util=cpw.mods.securejarhandler",
+//            "--add-exports", "jdk.naming.dns/com.sun.jndi.dns=java.naming",
+//            "-DlegacyClassPath.file=$aeDir/build/test_classpath.txt",
+//            "-Dfml.gameLayerLibraries=events-${fmlVersion}.jar",
+//            "-DignoreList=securejarhandler-2.1.24.jar,asm-9.5.jar,asm-commons-9.5.jar,asm-tree-9.5.jar,asm-util-9.5.jar,asm-analysis-9.5.jar,bootstraplauncher-1.1.2.jar,JarJarFileSystems-0.4.0.jar,events-2.0.1.jar,core-2.0.1.jar,language-java-2.0.1.jar,language-lowcode-2.0.1.jar,language-minecraft-2.0.1.jar,mixinextras-neoforge-0.3.2.jar,client-extra,neoforge-",
+//            "-DmergeModules=jna-5.10.0.jar,jna-platform-5.10.0.jar",
+//            "-Djava.net.preferIPv6Addresses=system",
+//            "-Dfml.pluginLayerLibraries=core-${fmlVersion}.jar,language-java-${fmlVersion}.jar,language-lowcode-${fmlVersion}.jar,language-minecraft-${fmlVersion}.jar",
+//    ]
 }
 
 dependencies {

gradle.properties

@@ -15,7 +15,7 @@ artifact_basename=appliedenergistics2-neoforge
 minecraft_release=1.20
 minecraft_version=1.20.4
 minecraft_version_range=[1.20.4,1.20.5)
-neoforge_version=20.4.28-beta
+neoforge_version=20.4.55-beta
 neoforge_version_range=[20.4,)
 
 #########################################################

libs/junit/build.gradle

@@ -10,8 +10,8 @@ dependencies {
     implementation("org.junit.jupiter:junit-jupiter-api")
     compileOnly("org.junit.platform:junit-platform-launcher")
 
-    compileOnly "net.neoforged.fancymodloader:core:1.0.10"
-    compileOnly "net.neoforged.fancymodloader:loader:1.0.10"
+    compileOnly "net.neoforged.fancymodloader:core:2.0.4"
+    compileOnly "net.neoforged.fancymodloader:loader:2.0.4"
     compileOnly "org.mockito:mockito-junit-jupiter:5.3.1"
     compileOnly "cpw.mods:bootstraplauncher:1.1.2"
 }

src/main/resources/META-INF/mods.toml

@@ -1,10 +1,8 @@
 modLoader="javafml"
 loaderVersion="[1,)"
-#updateJSONURL=""
 issueTrackerURL="https://github.com/AppliedEnergistics/Applied-Energistics-2/issues"
 displayURL="https://github.com/AppliedEnergistics/Applied-Energistics-2"
 logoFile="logo.png"
-#credits="Thanks for this example mod goes to Java"
 authors="TeamAppliedEnergistics"
 license="See GitHub repository for details"
 
@@ -19,35 +17,35 @@ config="ae2.mixins.json"
 
 [[dependencies.ae2]]
     modId="neoforge"
-    mandatory=true
+    type="REQUIRED"
     versionRange="${neoforge_version}"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.ae2]]
     modId="minecraft"
-    mandatory=true
+    type="REQUIRED"
     versionRange="${minecraft_version}"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.ae2]]
     modId="jei"
-    mandatory=false
+    type="OPTIONAL"
     versionRange="${jei_version}"
     ordering="AFTER"
     side="CLIENT"
 
 [[dependencies.ae2]]
     modId="theoneprobe"
-    mandatory=false
+    type="OPTIONAL"
     versionRange="${top_version}"
     ordering="AFTER"
     side="BOTH"
 
 [[dependencies.ae2]]
     modId="jade"
-    mandatory=false
+    type="OPTIONAL"
     versionRange="${jade_version}"
     ordering="AFTER"
     side="BOTH"