From 849961adf45de11aaf26837296dd5381b6031bba Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Wed, 26 Jan 2022 14:49:01 +0200 Subject: [PATCH] Actually fix mixin configs by configuring them in afterEvaluate --- .../loom/task/RemapTaskConfiguration.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java index a9a8c4e0..5065e3f5 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java +++ b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java @@ -75,19 +75,9 @@ public class RemapTaskConfiguration { }); // Configure the default jar task - tasks.named(JavaPlugin.JAR_TASK_NAME, Jar.class).configure(task -> { + tasks.named(JavaPlugin.JAR_TASK_NAME, AbstractArchiveTask.class).configure(task -> { task.getArchiveClassifier().convention("dev"); task.getDestinationDirectory().set(new File(project.getBuildDir(), "devlibs")); - - if (extension.isForge()) { - Set mixinConfigs = PropertyUtil.getAndFinalize(extension.getForge().getMixinConfigs()); - - if (!mixinConfigs.isEmpty()) { - task.manifest(manifest -> { - manifest.attributes(Map.of(Constants.Forge.MIXIN_CONFIGS_MANIFEST_KEY, String.join(",", mixinConfigs))); - }); - } - } }); tasks.named(BasePlugin.ASSEMBLE_TASK_NAME).configure(task -> task.dependsOn(remapJarTask)); @@ -111,6 +101,16 @@ public class RemapTaskConfiguration { if (PropertyUtil.getAndFinalize(extension.getForge().getConvertAccessWideners())) { Aw2At.setup(project, remapJarTask); } + + Set mixinConfigs = PropertyUtil.getAndFinalize(extension.getForge().getMixinConfigs()); + + if (!mixinConfigs.isEmpty()) { + tasks.named(JavaPlugin.JAR_TASK_NAME, Jar.class, task -> { + task.manifest(manifest -> { + manifest.attributes(Map.of(Constants.Forge.MIXIN_CONFIGS_MANIFEST_KEY, String.join(",", mixinConfigs))); + }); + }); + } } }); }