hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow other source sets to be remapped without needing an access widener

Browse source
This commit is contained in:
Joe 2020-05-11 12:48:04 +01:00
parent 26755cb82c
commit a134913c71
No known key found for this signature in database
GPG key ID: 1CFA16855A08AEAB
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/net/fabricmc/loom/AbstractPlugin.java
View file

@ -295,6 +295,7 @@ public class AbstractPlugin implements Plugin<Project> {
extension.addUnmappedMod(jarTask.getArchivePath().toPath()); extension.addUnmappedMod(jarTask.getArchivePath().toPath());
remapJarTask.getAddNestedDependencies().set(true); remapJarTask.getAddNestedDependencies().set(true);
remapJarTask.getRemapAccessWidener().set(true);
project1.getArtifacts().add("archives", remapJarTask); project1.getArtifacts().add("archives", remapJarTask);
remapJarTask.dependsOn(jarTask); remapJarTask.dependsOn(jarTask);

4
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View file

@ -100,6 +100,10 @@ public class LoomGradleExtension {
return installerJson; return installerJson;
} }
public void accessWidener(Object file) {
this.accessWidener = project.file(file);
}
public File getUserCache() { public File getUserCache() {
File userCache = new File(project.getGradle().getGradleUserHomeDir(), "caches" + File.separator + "fabric-loom"); File userCache = new File(project.getGradle().getGradleUserHomeDir(), "caches" + File.separator + "fabric-loom");

9
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View file

@ -53,11 +53,13 @@ import net.fabricmc.tinyremapper.TinyUtils;
public class RemapJarTask extends Jar { public class RemapJarTask extends Jar {
private RegularFileProperty input; private RegularFileProperty input;
private Property<Boolean> addNestedDependencies; private Property<Boolean> addNestedDependencies;
private Property<Boolean> remapAccessWidener;
public RemapJarTask() { public RemapJarTask() {
super(); super();
input = GradleSupport.getfileProperty(getProject()); input = GradleSupport.getfileProperty(getProject());
addNestedDependencies = getProject().getObjects().property(Boolean.class); addNestedDependencies = getProject().getObjects().property(Boolean.class);
remapAccessWidener = getProject().getObjects().property(Boolean.class);
} }
@TaskAction @TaskAction
@ -129,7 +131,7 @@ public class RemapJarTask extends Jar {
} }
} }
if (extension.accessWidener != null) { if (getRemapAccessWidener().getOrElse(false) && extension.accessWidener != null) {
extension.getJarProcessorManager().getByType(AccessWidenerJarProcessor.class).remapAccessWidener(output); extension.getJarProcessorManager().getByType(AccessWidenerJarProcessor.class).remapAccessWidener(output);
} }
@ -154,4 +156,9 @@ public class RemapJarTask extends Jar {
public Property<Boolean> getAddNestedDependencies() { public Property<Boolean> getAddNestedDependencies() {
return addNestedDependencies; return addNestedDependencies;
} }
@Input
public Property<Boolean> getRemapAccessWidener() {
return remapAccessWidener;
}
} }