Updating Launcher

build.gradle

@@ -1,16 +1,5 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-    	classpath "com.github.jengelman.gradle.plugins:shadow:2.0.1"
-    }
-}
-
 plugins {
-    id "com.github.johnrengelman.shadow" version "4.0.4"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
     id 'io.freefair.lombok' version '5.3.0'
 }
 
@@ -24,13 +13,15 @@ println """
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'maven'
 
     group = 'com.skcraft'
     version = '4.6-SNAPSHOT'
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(8))
+        }
+    }
 
     repositories {
         mavenCentral()
@@ -47,6 +38,34 @@ subprojects {
         workingDir = new File(rootDir, "run/")
         workingDir.mkdirs()
     }
+
+    // Work around gradle shadow bug
+    // see https://github.com/johnrengelman/shadow/issues/713
+    afterEvaluate {
+        startScripts {
+            dependsOn(shadowJar)
+        }
+
+        distTar {
+            dependsOn(shadowJar)
+        }
+
+        distZip {
+            dependsOn(shadowJar)
+        }
+
+        startShadowScripts {
+            dependsOn(jar)
+        }
+
+        shadowDistTar {
+            dependsOn(jar)
+        }
+
+        shadowDistZip {
+            dependsOn(jar)
+        }
+    }
 }
 
 task clean {

creator-tools/build.gradle

@@ -5,15 +5,15 @@ plugins {
 }
 
 version = "2.1.0-SNAPSHOT"
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
 
-mainClassName = "com.skcraft.launcher.creator.Creator"
+application {
+    mainClassName = "com.skcraft.launcher.creator.Creator"
+}
 
 dependencies {
-    compile project(':launcher-builder')
-    compile 'org.eclipse.jetty:jetty-server:9.3.1.v20150714'
-    compile 'com.jidesoft:jide-oss:3.6.10'
+    implementation project(path: ':launcher-builder')
+    implementation 'org.eclipse.jetty:jetty-server:9.3.1.v20150714'
+    implementation 'com.jidesoft:jide-oss:3.6.18'
 }
 
 processResources {
@@ -25,6 +25,9 @@ processResources {
 }
 
 shadowJar {
+    archiveClassifier.set("")
 }
 
-build.dependsOn(shadowJar)
+build {
+    dependsOn(shadowJar)
+}

gradle/wrapper/gradle-wrapper.properties

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

launcher-bootstrap/build.gradle

@@ -4,11 +4,13 @@ plugins {
     id 'io.freefair.lombok'
 }
 
-mainClassName = "com.skcraft.launcher.Bootstrap"
+application {
+    mainClassName = "com.skcraft.launcher.Bootstrap"
+}
 
 dependencies {
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
-    compile 'javax.xml.bind:jaxb-api:2.3.0'
+    implementation 'com.googlecode.json-simple:json-simple:1.1.1'
+    implementation 'javax.xml.bind:jaxb-api:2.3.1'
 }
 
 processResources {
@@ -20,6 +22,9 @@ processResources {
 }
 
 shadowJar {
+    archiveClassifier.set("")
 }
 
-build.dependsOn(shadowJar)
+build {
+    dependsOn(shadowJar)
+}

launcher-bootstrap/src/main/java/com/skcraft/launcher/Bootstrap.java

@@ -194,9 +194,21 @@ private File getUserLauncherDir() {
         String osName = System.getProperty("os.name").toLowerCase();
         if (osName.contains("win")) {
             return new File(getFileChooseDefaultDir(), getProperties().getProperty("homeFolderWindows"));
-        } else {
-            return new File(System.getProperty("user.home"), getProperties().getProperty("homeFolder"));
         }
+
+        File dotFolder = new File(System.getProperty("user.home"), getProperties().getProperty("homeFolder"));
+        String xdgFolderName = getProperties().getProperty("homeFolderLinux");
+
+        if (osName.contains("linux") && !dotFolder.exists() && xdgFolderName != null && !xdgFolderName.isEmpty()) {
+            String xdgDataHome = System.getenv("XDG_DATA_HOME");
+            if (xdgDataHome.isEmpty()) {
+                xdgDataHome = System.getProperty("user.home") + "/.local/share";
+            }
+
+            return new File(xdgDataHome, xdgFolderName);
+        }
+
+        return dotFolder;
     }
 
     private static boolean isPortableMode() {

launcher-bootstrap/src/main/resources/com/skcraft/launcher/bootstrap.properties

@@ -5,6 +5,7 @@
 #
 
 homeFolderWindows=Example Launcher
+homeFolderLinux=example_launcher
 homeFolder=.examplelauncher
 launcherClass=com.skcraft.launcher.Launcher
-latestUrl=http://update.skcraft.com/quark/launcher/latest.json
+latestUrl=http://update.skcraft.com/quark/launcher/latest.json

launcher-builder/build.gradle

@@ -1,18 +1,28 @@
 plugins {
     id 'application'
+    id 'java-library'
     id "com.github.johnrengelman.shadow"
     id 'io.freefair.lombok'
 }
 
-mainClassName = "com.skcraft.launcher.builder.PackageBuilder"
+application {
+    mainClassName = "com.skcraft.launcher.builder.PackageBuilder"
+}
 
 dependencies {
-    compile project(':launcher')
-    compile 'org.tukaani:xz:1.0'
-    compile 'org.apache.commons:commons-compress:1.9'
+    api project(':launcher')
+    implementation 'org.apache.commons:commons-compress:1.21'
 }
 
 shadowJar {
+    dependsOn ':launcher:shadowJar'
+    archiveClassifier.set("")
 }
 
+// Work around gradle shadow bug
+// see https://github.com/johnrengelman/shadow/issues/713
+startScripts.dependsOn(':launcher:shadowJar')
+distTar.dependsOn(':launcher:shadowJar')
+distZip.dependsOn(':launcher:shadowJar')
+
 build.dependsOn(shadowJar)

launcher-builder/src/main/java/com/skcraft/launcher/builder/PackageBuilder.java

@@ -125,7 +125,8 @@ public void addFiles(File dir, File destDir) throws IOException {
     public void addLoaders(File dir, File librariesDir) {
         logSection("Checking for mod loaders to install...");
 
-        LinkedHashSet<Library> collected = new LinkedHashSet<Library>();
+        VersionManifest version = manifest.getVersionManifest();
+	    LinkedHashSet<Library> collected = new LinkedHashSet<>();
 
         File[] files = dir.listFiles(new JarFileFilter());
         if (files != null) {
@@ -140,7 +141,6 @@ public void addLoaders(File dir, File librariesDir) {
 
         this.loaderLibraries.addAll(collected);
 
-        VersionManifest version = manifest.getVersionManifest();
         collected.addAll(version.getLibraries());
         version.setLibraries(collected);
     }
@@ -164,11 +164,13 @@ private void processLoader(LinkedHashSet<Library> loaderLibraries, File file, Fi
 
                 if (basicProfile.isLegacy()) {
                     processor = new OldForgeLoaderProcessor();
-                } else if (basicProfile.getProfile().equalsIgnoreCase("forge")) {
+                } else {
                     processor = new ModernForgeLoaderProcessor();
                 }
             } else if (BuilderUtils.getZipEntry(jarFile, "fabric-installer.json") != null) {
-            	processor = new FabricLoaderProcessor();
+            	processor = new FabricLoaderProcessor(FabricLoaderProcessor.Variant.FABRIC);
+            } else if (BuilderUtils.getZipEntry(jarFile, "quilt_installer.json") != null) {
+                processor = new FabricLoaderProcessor(FabricLoaderProcessor.Variant.QUILT);
             }
         } finally {
             closer.close();
@@ -204,9 +206,10 @@ public void downloadLibraries(File librariesDir) throws IOException, Interrupted
                 if (!outputPath.exists()) {
                     Files.createParentDirs(outputPath);
                     boolean found = false;
+                    boolean urlEmpty = artifact.getUrl().isEmpty();
 
-                    // Try just the URL, it might be a full URL to the file
-                    if (!artifact.getUrl().isEmpty()) {
+                    // If URL doesn't end with a /, it might be the direct file
+                    if (!urlEmpty && !artifact.getUrl().endsWith("/")) {
                         found = tryDownloadLibrary(library, artifact, artifact.getUrl(), outputPath);
                     }
 
@@ -219,7 +222,7 @@ public void downloadLibraries(File librariesDir) throws IOException, Interrupted
                     }
 
                     // Assume artifact URL is a maven repository URL and try that
-                    if (!found) {
+                    if (!found && !urlEmpty) {
                         URL url = LauncherUtils.concat(url(artifact.getUrl()), artifact.getPath());
                         found = tryDownloadLibrary(library, artifact, url.toString(), outputPath);
                     }
@@ -261,7 +264,9 @@ private boolean tryDownloadLibrary(Library library, Library.Artifact artifact, S
 
         try {
             log.info("Downloading library " + library.getName() + " from " + url + "...");
-            HttpRequest.get(url).execute().expectResponseCode(200).saveContent(tempFile);
+            HttpRequest.get(url).execute().expectResponseCode(200)
+                    .expectContentType("application/java-archive", "application/octet-stream", "application/zip")
+                    .saveContent(tempFile);
         } catch (IOException e) {
             log.info("Could not get file from " + url + ": " + e.getMessage());
             return false;
@@ -367,7 +372,7 @@ public void writeManifest(@NonNull File path) throws IOException {
 
     private static BuilderOptions parseArgs(String[] args) {
         BuilderOptions options = new BuilderOptions();
-        new JCommander(options, args);
+        new JCommander(options).parse(args);
         options.choosePaths();
         return options;
     }
@@ -407,7 +412,7 @@ public static void main(String[] args) throws IOException, InterruptedException
         // Initialize
         SimpleLogFormatter.configureGlobalLogger();
         ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT);
 
         Manifest manifest = new Manifest();
         manifest.setMinimumVersion(Manifest.MIN_PROTOCOL_VERSION);

launcher-builder/src/main/java/com/skcraft/launcher/builder/loaders/FabricLoaderProcessor.java

@@ -4,10 +4,14 @@
 import com.google.common.io.Closer;
 import com.skcraft.launcher.builder.BuilderUtils;
 import com.skcraft.launcher.model.loader.FabricMod;
+import com.skcraft.launcher.model.loader.QuiltMod;
+import com.skcraft.launcher.model.loader.Versionable;
 import com.skcraft.launcher.model.minecraft.Library;
+import com.skcraft.launcher.model.minecraft.MavenName;
 import com.skcraft.launcher.model.minecraft.VersionManifest;
 import com.skcraft.launcher.model.modpack.Manifest;
 import com.skcraft.launcher.util.HttpRequest;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.java.Log;
 
 import java.io.File;
@@ -18,39 +22,56 @@
 import java.util.zip.ZipEntry;
 
 @Log
+@RequiredArgsConstructor
 public class FabricLoaderProcessor implements ILoaderProcessor {
+	private final Variant variant;
+
 	@Override
 	public LoaderResult process(File loaderJar, Manifest manifest, ObjectMapper mapper, File baseDir) throws IOException {
 		JarFile jarFile = new JarFile(loaderJar);
 		LoaderResult result = new LoaderResult();
 		Closer closer = Closer.create();
 
 		try {
-			String loaderVersion;
+			Versionable loaderMod;
 
-			ZipEntry modEntry = BuilderUtils.getZipEntry(jarFile, "fabric.mod.json");
+			ZipEntry modEntry = BuilderUtils.getZipEntry(jarFile, variant.modJsonName);
 			if (modEntry != null) {
 				InputStreamReader reader = new InputStreamReader(jarFile.getInputStream(modEntry));
-				FabricMod loaderMod = mapper.readValue(
-						BuilderUtils.readStringFromStream(closer.register(reader)), FabricMod.class);
 
-				loaderVersion = loaderMod.getVersion();
+				loaderMod = mapper.readValue(
+						BuilderUtils.readStringFromStream(closer.register(reader)), variant.mappedClass);
 			} else {
-				log.warning("Fabric loader has no 'fabric.mod.json' file, is it really a Fabric Loader jar?");
+				log.warning(String.format("%s loader has no '%s' file, is it really a %s Loader jar?",
+						variant.friendlyName, variant.modJsonName, variant.friendlyName));
 				return null;
 			}
 
-			log.info("Downloading fabric metadata...");
+			log.info(String.format("Downloading %s metadata...", variant.friendlyName));
 			URL metaUrl = HttpRequest.url(
-					String.format("https://meta.fabricmc.net/v2/versions/loader/%s/%s/profile/json",
-							manifest.getGameVersion(), loaderVersion));
+					String.format(variant.metaUrl, manifest.getGameVersion(), loaderMod.getVersion()));
 			VersionManifest fabricManifest = HttpRequest.get(metaUrl)
 					.execute()
 					.expectResponseCode(200)
 					.returnContent()
 					.asJson(VersionManifest.class);
 
 			for (Library library : fabricManifest.getLibraries()) {
+				// To quote a famous comment: "And here we come upon a sad state of affairs."
+				// Quilt's meta API returns broken data about how to launch the game. It specifies its own incomplete
+				// and ultimately broken set of intermediary mappings called "hashed". If the loader finds "hashed" in
+				// the classpath it tries to use it and blows up because it doesn't work.
+				// We work around this here by just throwing the hashed library out - they do now at least specify
+				// fabric's intermediary mappings in the library list, which DO work.
+				// Historical note: previously they didn't do this! Every launcher that added Quilt support had to add
+				// a hack that replaced hashed with intermediary! This is a lot of technical debt that is gonna come
+				// back to bite them in the ass later, because it's all still there!
+				// TODO pester Quilt again about fixing this....
+				MavenName libraryName = library.getName();
+				if (libraryName.getGroup().equals("org.quiltmc") && libraryName.getPath().equals("hashed") && loaderMod instanceof QuiltMod) {
+					continue;
+				}
+
 				result.getLoaderLibraries().add(library);
 				log.info("Adding loader library " + library.getName());
 			}
@@ -61,12 +82,24 @@ public LoaderResult process(File loaderJar, Manifest manifest, ObjectMapper mapp
 				log.info("Using main class " + mainClass);
 			}
 		} catch (InterruptedException e) {
-			log.warning("HTTP request to fabric metadata API was interrupted, this will probably not work!");
+			log.warning(String.format("HTTP request to %s metadata API was interrupted!", variant.friendlyName));
+			throw new IOException(e);
 		} finally {
 			closer.close();
 			jarFile.close();
 		}
 
 		return result;
 	}
+
+	@RequiredArgsConstructor
+	public enum Variant {
+		FABRIC("Fabric", "fabric.mod.json", "https://meta.fabricmc.net/v2/versions/loader/%s/%s/profile/json", FabricMod.class),
+		QUILT("Quilt", "quilt.mod.json", "https://meta.quiltmc.org/v3/versions/loader/%s/%s/profile/json", QuiltMod.class);
+
+		private final String friendlyName;
+		private final String modJsonName;
+		private final String metaUrl;
+		private final Class<? extends Versionable> mappedClass;
+	}
 }