imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 05:27:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9

Browse Source 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
This commit is contained in:
shedaniel
2021-06-20 20:24:40 +08:00
parent 3f9dc85fba 54d6ef7896
commit f3bf0a4207
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@@ -223,7 +223,7 @@ public class LoomGradleExtension {
}
public Dependency officialMojangMappings() {
return layered(LayeredMappingSpecBuilder::officalMojangMappings);
return layered(LayeredMappingSpecBuilder::officialMojangMappings);
}
public Dependency layered(Action<LayeredMappingSpecBuilder> action) {

2
src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
View File

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

2
src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java
View File

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