diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-06-20 20:24:40 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-06-20 20:24:40 +0800 |
| commit | f3bf0a420749c6ce107668199e122a2a679f69e9 (patch) | |
| tree | 1150b7b9e1e58ae2885fc09a7781371ebb2e426b /src/main/java/net | |
| parent | 3f9dc85fba8a3f1b7a1d9b6d00d424b263974aae (diff) | |
| parent | 54d6ef7896f22f89d6594703d09e3195c814cf10 (diff) | |
| download | architectury-loom-f3bf0a420749c6ce107668199e122a2a679f69e9.tar.gz architectury-loom-f3bf0a420749c6ce107668199e122a2a679f69e9.tar.bz2 architectury-loom-f3bf0a420749c6ce107668199e122a2a679f69e9.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
# Conflicts:
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
Diffstat (limited to 'src/main/java/net')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index e70946e8..021388d6 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -223,7 +223,7 @@ public class LoomGradleExtension { } public Dependency officialMojangMappings() { - return layered(LayeredMappingSpecBuilder::officalMojangMappings); + return layered(LayeredMappingSpecBuilder::officialMojangMappings); } public Dependency layered(Action<LayeredMappingSpecBuilder> action) { diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java index 035dcd06..ac4fac49 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java @@ -46,7 +46,7 @@ public class LayeredMappingSpecBuilder { this.extension = extension; } - public LayeredMappingSpecBuilder officalMojangMappings() { + public LayeredMappingSpecBuilder officialMojangMappings() { layers.add(new MojangMappingsSpec(() -> extension != null && extension.isSilentMojangMappingsLicenseEnabled())); return this; } diff --git a/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java b/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java index 6151f932..7f7074de 100644 --- a/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java +++ b/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java @@ -124,7 +124,7 @@ public class MigrateMappingsTask extends AbstractLoomTask { throw new UnsupportedOperationException("Migrating Mojang mappings is currently only supported for the specified minecraft version"); } - LayeredMappingsDependency dep = (LayeredMappingsDependency) getExtension().layered(LayeredMappingSpecBuilder::officalMojangMappings); + LayeredMappingsDependency dep = (LayeredMappingsDependency) getExtension().layered(LayeredMappingSpecBuilder::officialMojangMappings); files = dep.resolve(); } else { Dependency dependency = project.getDependencies().create(mappings); |