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

Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0

Browse Source 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
This commit is contained in:
Juuz
2022-07-07 11:04:31 +03:00
parent 989bde901d b25e5cd5a6
commit 549fd9c930
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ public class RemapTaskConfiguration {
final TaskContainer tasks = project.getTasks();
final LoomGradleExtension extension = LoomGradleExtension.get(project);
if (!extension.getRemapArchives().get()) {
if (getBooleanProperty(project, "fabric.loom.dontRemap")) {
extension.getUnmappedModCollection().from(project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME));
return;
}
@@ -103,7 +103,7 @@ public class RemapTaskConfiguration {
}
});
if (!extension.getSetupRemappedVariants().get()) {
if (getBooleanProperty(project, "fabric.loom.disableRemappedVariants")) {
return;
}
@@ -154,7 +154,7 @@ public class RemapTaskConfiguration {
tasks.named(BasePlugin.ASSEMBLE_TASK_NAME).configure(task -> task.dependsOn(remapSourcesTask));
if (!extension.getSetupRemappedVariants().get()) {
if (getBooleanProperty(project, "fabric.loom.disableRemappedVariants")) {
return;
}
@@ -177,4 +177,15 @@ public class RemapTaskConfiguration {
}
});
}
private static boolean getBooleanProperty(Project project, String key) {
return project.getProviders().gradleProperty(key).map(string -> {
try {
return Boolean.parseBoolean(string);
} catch (final IllegalArgumentException ex) {
return false;
}
})
.getOrElse(false);
}
}