Set artifact manifest for download assets too

neoforged · May 24, 2024 · d2881ff · d2881ff
1 parent 3de2115
commit d2881ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/java17/java/net/neoforged/moddevgradle/internal/DownloadAssetsTask.java b/src/java17/java/net/neoforged/moddevgradle/internal/DownloadAssetsTask.java
@@ -3,6 +3,8 @@
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
@@ -20,11 +22,16 @@ public DownloadAssetsTask() {
     @OutputFile
     abstract RegularFileProperty getAssetPropertiesFile();
 
+    @InputFile
+    @Optional
+    abstract RegularFileProperty getArtifactManifestFile();
+
     @TaskAction
     public void createArtifacts() {
         var artifactId = getNeoForgeArtifact().get();
 
         run(List.of(
+                "--artifact-manifest", getArtifactManifestFile().get().getAsFile().getAbsolutePath(),
                 "download-assets",
                 "--neoforge", artifactId + ":userdev",
                 "--output-properties-to", getAssetPropertiesFile().get().getAsFile().getAbsolutePath()

diff --git a/src/java17/java/net/neoforged/moddevgradle/internal/ModDevPluginImpl.java b/src/java17/java/net/neoforged/moddevgradle/internal/ModDevPluginImpl.java
@@ -214,6 +214,7 @@ public void apply(Project project) {
         var downloadAssets = tasks.register("downloadAssets", DownloadAssetsTask.class, task -> {
             task.getNeoForgeArtifact().set(extension.getVersion().map(version -> "net.neoforged:neoforge:" + version));
             task.getNeoFormRuntime().from(neoFormRuntimeConfig);
+            task.getArtifactManifestFile().set(createManifest.get().getManifestFile());
             task.getAssetPropertiesFile().set(layout.getBuildDirectory().file("minecraft_assets.properties"));
         });