Skip to content

Commit 6103e60

Browse files
committed
Fix syncMinecraftMaven not respecting output directory
The `minecraft` extension sets its own output for the Mavenizer internally. I forgot to link it to the task. This fixes that so the Mavenizer should work now.
1 parent 20bc378 commit 6103e60

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main/java/net/minecraftforge/gradle/MinecraftExtensionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ void finish(Project project) {
240240

241241
this.minecraftDependencies.forEach(MinecraftDependencyImpl::resolve);
242242

243-
SyncMinecraftMaven.register(project, this.minecraftDependencies);
243+
SyncMinecraftMaven.register(project, this);
244244

245245
var ext = project.getExtensions().getExtraProperties();
246246
//noinspection DataFlowIssue

src/main/java/net/minecraftforge/gradle/SyncMinecraftMaven.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@ abstract class SyncMinecraftMaven extends DefaultTask implements EnhancedTask, H
4646
/** The name of the task that is used to sync the Minecraft Maven. */
4747
static final String NAME = "syncMinecraftMaven";
4848

49-
static TaskProvider<SyncMinecraftMaven> register(Project project, Collection<? extends MinecraftDependencyInternal> requests) {
50-
return Util.runFirst(project, project.getTasks().register(NAME,
51-
SyncMinecraftMaven.class,
52-
task -> task.getRequests().addAll(Request.collect(requests))
53-
));
49+
static TaskProvider<SyncMinecraftMaven> register(Project project, MinecraftExtensionImpl.ForProjectImpl<?> minecraft) {
50+
return Util.runFirst(project, project.getTasks().register(NAME, SyncMinecraftMaven.class, task -> {
51+
task.getRequests().addAll(Request.collect(minecraft.minecraftDependencies));
52+
task.getOutput().set(minecraft.output);
53+
})
54+
);
5455
}
5556

5657
private final ForgeGradleProblems problems;

0 commit comments

Comments
 (0)