Update Gradle to 9.2.0

Update JUnit to version 6

Fix NeoForge installation detection for some last versions

Author: FlowArg

build.gradle

@@ -6,19 +6,22 @@ plugins {
 }
 
 group = 'fr.flowarg'
-version = '1.9.3'
+version = '1.9.4'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
+        languageVersion = JavaLanguageVersion.of(17)
     }
     withJavadocJar()
     withSourcesJar()
 }
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.named("compileJava").configure {
+    options.release.set(8)
 }
 
 repositories {
@@ -27,13 +30,13 @@ repositories {
 }
 
 dependencies {
-    api 'com.google.code.gson:gson:2.13.1'
-    api 'fr.flowarg:flowmultitools:1.4.5'
-    api 'org.jetbrains:annotations:26.0.2'
+    api libs.gson
+    api libs.flowmultitools
+    api libs.annotations
 
     // Only for internal tests
-    testImplementation 'fr.flowarg:openlauncherlib:3.2.11'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation libs.oll
+    testImplementation libs.junit.jupiter
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

gradle/libs.versions.toml

@@ -0,0 +1,15 @@
+[versions]
+gson = "2.13.2"
+flowmultitools = "1.4.5"
+
+annotations = "26.0.2"
+
+oll = "3.2.11"
+junit = "6.0.1"
+
+[libraries]
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+flowmultitools = { module = "fr.flowarg:flowmultitools", version.ref = "flowmultitools" }
+annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
+oll = { module = "fr.flowarg:openlauncherlib", version.ref = "oll" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/fr/flowarg/flowupdater/FlowUpdater.java

@@ -36,7 +36,7 @@
 public class FlowUpdater
 {
     /** FlowUpdater's version string constant */
-    public static final String FU_VERSION = "1.9.3";
+    public static final String FU_VERSION = "1.9.4";
 
     /** Vanilla version's object to update/install */
     private final VanillaVersion vanillaVersion;

src/main/java/fr/flowarg/flowupdater/versions/neoforge/NeoForgeVersion.java

@@ -5,6 +5,7 @@
 import fr.flowarg.flowupdater.download.json.*;
 import fr.flowarg.flowupdater.utils.IOUtils;
 import fr.flowarg.flowupdater.utils.ModFileDeleter;
+import fr.flowarg.flowupdater.utils.Version;
 import fr.flowarg.flowupdater.versions.AbstractModLoaderVersion;
 import fr.flowarg.flowupdater.versions.ModLoaderUtils;
 import fr.flowarg.flowupdater.versions.ParsedLibrary;
@@ -70,9 +71,21 @@ public boolean isModLoaderAlreadyInstalled(@NotNull Path installDir)
                 .resolve(this.modLoaderVersion);
 
         final Path universalNeoForgeJar = neoForgeDirectory.resolve(this.versionId + "-universal.jar");
+        final Path minecraftClientPatchedJar = installDir.resolve("libraries")
+                .resolve("net")
+                .resolve("neoforged")
+                .resolve("minecraft-client-patched")
+                .resolve(this.modLoaderVersion)
+                .resolve("minecraft-client-patched-" + this.modLoaderVersion + ".jar"); // starting from 21.10.37-beta
         final Path clientNeoForgeJar = neoForgeDirectory.resolve(this.versionId + "-client.jar");
 
-        return Files.exists(universalNeoForgeJar) && Files.exists(clientNeoForgeJar);
+        final Version modLoaderVer = Version.gen(this.modLoaderVersion.split("-")[0]); // skip -beta/alpha etc strings
+
+        return Files.exists(universalNeoForgeJar) && (
+                Files.exists(
+                        modLoaderVer.isNewerOrEqualTo(Version.gen("21.10.37")) ? minecraftClientPatchedJar : clientNeoForgeJar
+                )
+        );
     }
 
     @Override