imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 21:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Actually fix mixin configs by configuring them in afterEvaluate

Browse Source
This commit is contained in:
Juuz
2022-01-26 14:49:01 +02:00
parent 6cdf12994b
commit 849961adf4
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
View File

@@ -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<String> 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<String> 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)));
});
});
}
}
});
}