Make empty launcher runs when dependency doesn't specify any. Closes #1049

Author: LexManos

src/main/java/net/minecraftforge/gradle/internal/SlimeLauncherEclipseConfiguration.java

@@ -80,7 +80,7 @@ abstract class SlimeLauncherEclipseConfiguration extends DefaultTask implements
 
     protected abstract @InputFiles ConfigurableFileCollection getMetadata();
 
-    protected abstract @InputFile RegularFileProperty getRunsJson();
+    protected abstract @InputFile @Optional RegularFileProperty getRunsJson();
 
     protected abstract @Inject ObjectFactory getObjects();
 
@@ -118,13 +118,16 @@ protected void exec() {
 
         //region Launcher Metadata Inheritance
         Map<String, RunConfig> configs = Map.of();
-        try {
-            configs = JsonData.fromJson(
-                this.getRunsJson().getAsFile().get(),
-                new TypeToken<>() { }
-            );
-        } catch (JsonIOException e) {
-            // continue
+        var jsons = this.getRunsJson().getAsFile().getOrNull();
+        if (jsons != null && jsons.exists()) {
+            try {
+                configs = JsonData.fromJson(
+                    this.getRunsJson().getAsFile().get(),
+                    new TypeToken<>() { }
+                );
+            } catch (JsonIOException e) {
+                // continue
+            }
         }
 
         var options = ((SlimeLauncherOptionsInternal) this.getOptions().get()).inherit(configs, this.getSourceSetName().get());

src/main/java/net/minecraftforge/gradle/internal/SlimeLauncherExec.java

@@ -14,9 +14,7 @@
 import org.gradle.api.artifacts.ModuleIdentifier;
 import org.gradle.api.attributes.Usage;
 import org.gradle.api.file.ConfigurableFileCollection;
-import org.gradle.api.file.Directory;
 import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.file.DirectoryTree;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
@@ -41,7 +39,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -160,7 +157,7 @@ static TaskProvider<SlimeLauncherExec> register(Project project, SourceSet sourc
 
     protected abstract @InputFiles ConfigurableFileCollection getMetadata();
 
-    protected abstract @InputFile RegularFileProperty getRunsJson();
+    protected abstract @InputFile @Optional RegularFileProperty getRunsJson();
 
     protected abstract @Input @Optional Property<Boolean> getClient();
 
@@ -193,13 +190,16 @@ public void exec() {
 
         //region Launcher Metadata Inheritance
         Map<String, RunConfig> configs = Map.of();
-        try {
-            configs = JsonData.fromJson(
-                this.getRunsJson().getAsFile().get(),
-                new TypeToken<>() { }
-            );
-        } catch (JsonIOException e) {
-            // continue
+        var jsons = this.getRunsJson().getAsFile().getOrNull();
+        if (jsons != null && jsons.exists()) {
+            try {
+                configs = JsonData.fromJson(
+                    this.getRunsJson().getAsFile().get(),
+                    new TypeToken<>() { }
+                );
+            } catch (JsonIOException e) {
+                // continue
+            }
         }
 
         var options = ((SlimeLauncherOptionsInternal) this.getOptions().get()).inherit(configs, this.getSourceSetName().get());

src/main/java/net/minecraftforge/gradle/internal/SlimeLauncherMetadata.java

@@ -13,39 +13,45 @@
 import org.gradle.api.tasks.TaskAction;
 
 import javax.inject.Inject;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 abstract class SlimeLauncherMetadata extends DefaultTask implements ForgeGradleTask {
     protected abstract @InputFiles ConfigurableFileCollection getMetadata();
 
     protected abstract @OutputFile RegularFileProperty getRunsJson();
 
-    protected abstract @Inject ArchiveOperations getArchiveOperations();
-
     @Inject
     public SlimeLauncherMetadata() {
         this.getRunsJson().convention(this.getDefaultOutputDirectory().map(d -> d.file("runs.json")));
     }
 
     @TaskAction
-    protected void exec() {
-        this.getArchiveOperations().zipTree(this.getMetadata().getSingleFile())
-            .matching(it -> it.include("launcher/**"))
-            .visit(file -> {
-                try {
-                    if (file.getPath().equals("launcher/runs.json")) {
-                        Files.copy(
-                            file.getFile().toPath(),
-                            this.getRunsJson().getAsFile().get().toPath(),
-                            StandardCopyOption.REPLACE_EXISTING,
-                            StandardCopyOption.COPY_ATTRIBUTES
-                        );
-                    }
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+    protected void exec() throws IOException {
+        var archive = this.getMetadata().getSingleFile();
+        var json = this.getRunsJson().getAsFile().get().toPath();
+
+        boolean foundRuns = false;
+        try (var zin = new ZipInputStream(new FileInputStream(archive))) {
+            for (ZipEntry entry; ((entry = zin.getNextEntry()) != null); ) {
+                if (!entry.getName().startsWith("launcher/"))
+                    continue;
+                if (entry.getName().equals("launcher/runs.json")) {
+                    Files.copy(zin, json, StandardCopyOption.REPLACE_EXISTING);
+                    foundRuns = true;
                 }
-            });
+            }
+        }
+
+        // If we don't find a metadata file, write an empty runs
+        // This happens when using a 'vanilla' minecraft dependency
+        if (!foundRuns)
+            Files.writeString(json, "{}", StandardCharsets.UTF_8);
     }
 }