jar merging improvements

- fix the bundler not being included
- add feedback message
- make MC depend on distmarker

Author: TropheusJ

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/mcmaven/MinecraftMaven.java

@@ -216,7 +216,7 @@ private static Request extractRequest(URI uri) {
 			}
 		}
 
-		logger.quiet("Intercepted request for Minecraft definition {}, {}, {}", defName, artifact, hashAlgorithm);
+		logger.debug("Intercepted request for Minecraft definition {}, {}, {}", defName, artifact, hashAlgorithm);
 
 		return new Request(dist, version1, version, defName, hash, artifact, Optional.ofNullable(hashAlgorithm));
 	}

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/mcmaven/PomGenerator.java

@@ -9,12 +9,14 @@
 import fish.cichlidmc.pistonmetaparser.version.library.Classifier;
 import fish.cichlidmc.pistonmetaparser.version.library.Library;
 import fish.cichlidmc.pistonmetaparser.version.library.Natives;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public final class PomGenerator {
@@ -26,10 +28,25 @@ public static void generate(FullVersion version, Distribution dist, Path output)
 				new XmlBuilder.XmlElement("groupId", "net.minecraft"),
 				new XmlBuilder.XmlElement("artifactId", "minecraft-" + dist.name),
 				new XmlBuilder.XmlElement("version", VERSION_PLACEHOLDER),
-				new XmlBuilder.XmlElement("dependencies", version.libraries.stream().flatMap(PomGenerator::makeDependencyElements).toList())
+				new XmlBuilder.XmlElement("dependencies", makeDependencyElements(version, dist))
 		))).write(output);
 	}
 
+	private static List<XmlBuilder.XmlElement> makeDependencyElements(FullVersion version, Distribution dist) {
+		List<XmlBuilder.XmlElement> elements = version.libraries.stream()
+				.flatMap(PomGenerator::makeDependencyElements)
+				// explicitly collect to a mutable list
+				.collect(Collectors.toCollection(ArrayList::new));
+
+		// when merged, add a dependency on distmarker
+		if (dist == Distribution.MERGED) {
+			// I don't mind hardcoding this version here because it will hopefully never be updated again
+			elements.add(makeDependencyElement("fish.cichlidmc", "distribution-marker", "1.0.1", null));
+		}
+
+		return elements;
+	}
+
 	private static Stream<XmlBuilder.XmlElement> makeDependencyElements(Library library) {
 		// check rules first
 		if (!Rule.test(library.rules, Features.EMPTY))
@@ -38,13 +55,13 @@ private static Stream<XmlBuilder.XmlElement> makeDependencyElements(Library libr
 		List<XmlBuilder.XmlElement> elements = new ArrayList<>();
 		Optional<Artifact> artifact = library.artifact;
 		if (artifact.isPresent()) {
-			elements.add(makeDependencyXml(library.name));
+			elements.add(makeDependencyElement(library.name));
 		}
 
 		Optional<Classifier> classifier = library.natives.flatMap(Natives::choose);
 		if (classifier.isPresent()) {
 			String notation = library.name + ':' + classifier.get().name;
-			elements.add(makeDependencyXml(notation));
+			elements.add(makeDependencyElement(notation));
 		}
 
 		if (elements.isEmpty()) {
@@ -54,17 +71,24 @@ private static Stream<XmlBuilder.XmlElement> makeDependencyElements(Library libr
 		return elements.stream();
 	}
 
-	private static XmlBuilder.XmlElement makeDependencyXml(String notation) {
+	private static XmlBuilder.XmlElement makeDependencyElement(String notation) {
 		String[] split = notation.split(":");
-		XmlBuilder.XmlElement element = new XmlBuilder.XmlElement("dependency", new ArrayList<>(List.of(
-				new XmlBuilder.XmlElement("groupId", split[0]),
-				new XmlBuilder.XmlElement("artifactId", split[1]),
-				new XmlBuilder.XmlElement("version", split[2]),
+		String classifier = split.length > 3 ? split[3] : null;
+		return makeDependencyElement(split[0], split[1], split[2], classifier);
+	}
+
+	private static XmlBuilder.XmlElement makeDependencyElement(String group, String artifact, String version, @Nullable String classifier) {
+		List<XmlBuilder.XmlElement> children = new ArrayList<>(List.of(
+				new XmlBuilder.XmlElement("groupId", group),
+				new XmlBuilder.XmlElement("artifactId", artifact),
+				new XmlBuilder.XmlElement("version", version),
 				new XmlBuilder.XmlElement("scope", "compile")
-		)));
-		if (split.length > 3) {
-			element.children().add(new XmlBuilder.XmlElement("classifier", split[3]));
+		));
+
+		if (classifier != null) {
+			children.add(new XmlBuilder.XmlElement("classifier", classifier));
 		}
-		return element;
+
+		return new XmlBuilder.XmlElement("dependency", children);
 	}
 }

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/impl/MergeTask.java

@@ -7,12 +7,14 @@
 import fish.cichlidmc.cichlid_gradle.merge.MergeSource;
 import fish.cichlidmc.cichlid_gradle.util.Distribution;
 import fish.cichlidmc.distmarker.Dist;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 public class MergeTask extends CacheTask {
@@ -24,28 +26,40 @@ public MergeTask(CacheTaskEnvironment env) {
 	protected String run() throws IOException {
 		JarsStorage jars = this.env.cache.getVersion(this.env.version.id).jars;
 
-		List<CompletableFuture<MergeSource>> futures = new ArrayList<>();
-
-		for (Dist dist : Dist.values()) {
-			Path jar = jars.get(dist);
-			if (Files.exists(jar)) {
-				futures.add(CompletableFuture.completedFuture(new MergeSource(dist, jar)));
-			} else {
-				Distribution distribution = switch (dist) {
-					case CLIENT -> Distribution.CLIENT;
-					case SERVER -> Distribution.SERVER;
-					default -> null;
-				};
-
-				if (distribution != null) {
-					CacheTaskEnvironment env = this.env.withDist(distribution);
-					futures.add(env.submit(SetupTask::new).thenApply($ -> MergeSource.createUnchecked(dist, jar)));
-				}
-			}
-		}
+		List<CompletableFuture<@Nullable MergeSource>> futures = new ArrayList<>();
+
+		futures.add(this.createFuture(Distribution.CLIENT, jars));
+		CompletableFuture<MergeSource> server = this.createFuture(Distribution.SERVER, jars);
+		futures.add(server);
+
+		// need to wait for the server to be done before checking for the bundler
+		futures.add(server.thenApply(ignored -> {
+			Path bundler = jars.get(Dist.BUNDLER);
+			return Files.exists(bundler) ? MergeSource.createUnchecked(Dist.BUNDLER, bundler) : null;
+		}));
+
+		List<MergeSource> sources = futures.stream()
+				.map(CompletableFuture::join)
+				.filter(Objects::nonNull)
+				.toList();
 
-		List<MergeSource> sources = futures.stream().map(CompletableFuture::join).toList();
 		JarMerger.merge(sources, jars.get(Distribution.MERGED));
-		return null;
+		return "Merged " + sources.size() + " sources: " + sources;
+	}
+
+	private CompletableFuture<MergeSource> createFuture(Distribution dist, JarsStorage jars) throws IOException {
+		Dist asMarkerDist = switch (dist) {
+			case CLIENT -> Dist.CLIENT;
+			case SERVER -> Dist.SERVER;
+			case MERGED -> throw new IllegalArgumentException("MERGED is not allowed");
+		};
+
+		Path jar = jars.get(dist);
+		if (Files.exists(jar)) {
+			return CompletableFuture.completedFuture(new MergeSource(asMarkerDist, jar));
+		} else {
+			CacheTaskEnvironment env = this.env.withDist(dist);
+			return env.submit(SetupTask::new).thenApply($ -> MergeSource.createUnchecked(asMarkerDist, jar));
+		}
 	}
 }