diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index 744906c..29ffee9 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -297,6 +297,7 @@ public class AbstractPlugin implements Plugin { extension.addUnmappedMod(jarTask.getArchivePath().toPath()); remapJarTask.getAddNestedDependencies().set(true); + remapJarTask.getRemapAccessWidener().set(true); project1.getArtifacts().add("archives", remapJarTask); remapJarTask.dependsOn(jarTask); diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index a01ae9f..79100cd 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -99,6 +99,10 @@ public class LoomGradleExtension { return installerJson; } + public void accessWidener(Object file) { + this.accessWidener = project.file(file); + } + public File getUserCache() { File userCache = new File(project.getGradle().getGradleUserHomeDir(), "caches" + File.separator + "fabric-loom"); diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java index 6a041a1..d668c70 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java @@ -53,11 +53,15 @@ import net.fabricmc.tinyremapper.TinyUtils; public class RemapJarTask extends Jar { private RegularFileProperty input; private Property addNestedDependencies; + private Property remapAccessWidener; public RemapJarTask() { super(); input = GradleSupport.getfileProperty(getProject()); addNestedDependencies = getProject().getObjects().property(Boolean.class); + remapAccessWidener = getProject().getObjects().property(Boolean.class); + // false by default, I have no idea why I have to do it for this property and not the other one + remapAccessWidener.set(false); } @TaskAction @@ -114,7 +118,7 @@ public class RemapJarTask extends Jar { throw new RuntimeException("Failed to remap " + input + " to " + output, e); } - if (extension.accessWidener != null) { + if (getRemapAccessWidener().getOrElse(false) && extension.accessWidener != null) { extension.getJarProcessorManager().getByType(AccessWidenerJarProcessor.class).remapAccessWidener(output, remapper.getRemapper()); } @@ -155,4 +159,9 @@ public class RemapJarTask extends Jar { public Property getAddNestedDependencies() { return addNestedDependencies; } + + @Input + public Property getRemapAccessWidener() { + return remapAccessWidener; + } }