Update

neoforged · Jul 4, 2024 · efe2249 · efe2249
1 parent 51f5708
commit efe2249
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java b/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java
@@ -728,8 +728,7 @@ public void runtime(final String neoFormVersion, Directory patches, Directory re
                 final var sourcesWithoutParchment = RuntimeDevRuntimeExtension.applyParchment(
                         project,
                         "reverseParchment",
-                        parchmentArtifact.map(art -> ToolUtilities.resolveTool(project, art)),
-                        // mergeMappings.flatMap(WithOutput::getOutput).map(RegularFile::getAsFile),
+                        mergeMappings.flatMap(WithOutput::getOutput).map(RegularFile::getAsFile),
                         project.provider(() -> "p_"),
                         project.getLayout().file(project.provider(() -> sourceSetDir)),
                         runtimeDefinition.getSpecification(),

diff --git a/...a/net/neoforged/gradle/platform/runtime/runtime/extension/RuntimeDevRuntimeExtension.java b/...a/net/neoforged/gradle/platform/runtime/runtime/extension/RuntimeDevRuntimeExtension.java
@@ -99,7 +99,6 @@ public static TaskProvider<DefaultExecute> applyParchment(Project project,
             task.getProgramArguments().add("--no-parchment-javadoc");
             task.getProgramArguments().add("--parchment-mappings");
             task.getProgramArguments().add("{mappings}");
-            task.getProgramArguments().add("--in-format=archive");
             task.getProgramArguments().add("--out-format=archive");
             if (conflictPrefix.isPresent() && !conflictPrefix.get().isBlank()) {
                 task.getProgramArguments().add("--parchment-conflict-prefix=%s".formatted(conflictPrefix.get()));