Gradle 8.0.2

Update JSON dep

3.2.6

Added 1.12.2 compatibility (OLD_FORGE is for 14.23.5.2847 and lower like for FlowUpdater)

Author: FlowArg

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.0'
 }
 
 apply plugin: 'java-library'
@@ -8,7 +8,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 group 'fr.flowarg'
-version '3.2.5'
+version '3.2.6'
 archivesBaseName = 'openlauncherlib'
 
 compileJava {
@@ -27,26 +27,20 @@ jar {
     from "LICENSE.LESSER"
 }
 
-task sourcesJar(type: Jar) {
-    classifier 'sources'
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar) {
-    classifier 'javadoc'
-    from javadoc
+java {
+    withSourcesJar()
+    withJavadocJar()
 }
 
 artifacts {
-    archives sourcesJar, javadocJar
+    archives sourcesJar
+    archives javadocJar
 }
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            artifact tasks.sourcesJar
-            artifact tasks.javadocJar
 
             pom {
                 groupId = project.group
@@ -113,9 +107,9 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.json:json:20220320'
+    implementation 'org.json:json:20230227'
 }
 
 shadowJar {
-    classifier 'shaded'
+    archiveClassifier = 'shaded'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Sun Dec 29 21:36:55 CET 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/main/java/fr/flowarg/openlauncherlib/NoFramework.java

@@ -110,6 +110,7 @@ public NoFramework(Path gameDir, AuthInfos infos, GameFolder folder, List<String
 
     public enum ModLoader
     {
+        OLD_FORGE((version, modLoaderVersion) -> version + "-forge" + (modLoaderVersion.startsWith(version) ? modLoaderVersion : version + "-" + modLoaderVersion) + ".json"), // only to 1.12.2-14.23.5.2847
         FORGE((version, modLoaderVersion) -> version + "-forge-" + modLoaderVersion + ".json"),
         VANILLA(null),
         FABRIC((version, modLoaderVersion) -> "fabric-loader-" + modLoaderVersion + "-" + version + ".json"),
@@ -186,6 +187,12 @@ private List<String> getVmArgsFor(JSONObject object, JSONObject vanilla)
 
         final List<String> sb = new ArrayList<>();
 
+        if(object.isNull("arguments"))
+        {
+            sb.add("-Djava.library.path=" + this.map("${natives_directory}", parameters));
+            return sb;
+        }
+
         final JSONObject arguments = object.getJSONObject("arguments");
 
         if(arguments.isNull("jvm")) return sb;
@@ -230,7 +237,14 @@ private void appendLibraries(List<String> sb, JSONObject object)
                 final String[] nameParts = libraryObject.getString("name").split(":");
                 path = this.libraries.resolve(nameParts[0].replace('.', '/')).resolve(nameParts[1]).resolve(nameParts[2]).resolve(nameParts[1] + "-" + nameParts[2] + ".jar");
             }
-            else path = this.libraries.resolve(libraryObject.getJSONObject("downloads").getJSONObject("artifact").getString("path"));
+            else
+            {
+                final JSONObject downloads = libraryObject.getJSONObject("downloads");
+
+                if(downloads.isNull("artifact"))
+                    return;
+                path = this.libraries.resolve(downloads.getJSONObject("artifact").getString("path"));
+            }
             final String str = path.toAbsolutePath() + File.pathSeparator;
             if(!sb.contains(str) && Files.exists(path))
                 sb.add(str);
@@ -252,7 +266,18 @@ private List<String> getArgs(JSONObject vanilla, JSONObject modLoader)
 
     private List<String> getArgs(JSONObject object, Parameters parameters)
     {
-        final JSONArray array = object.getJSONObject("arguments").getJSONArray("game");
+        if(object.isNull("arguments"))
+        {
+            if(object.isNull("minecraftArguments") || object == parameters.vanilla)
+                return new ArrayList<>();
+
+            final List<String> sb = new ArrayList<>();
+            for (final String s : object.getString("minecraftArguments").split(" "))
+                sb.add(this.map(s, parameters));
+            return sb;
+        }
+        final JSONObject arguments = object.getJSONObject("arguments");
+        final JSONArray array = arguments.getJSONArray("game");
 
         final List<String> sb = new ArrayList<>();