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

Fix merge conflicts

Browse Source 
Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-11-29 01:54:17 +08:00
parent d51b44cdaa
commit 152d2801e4
3 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/configuration/providers/forge/SrgProvider.java
View File

@@ -253,7 +253,7 @@ public class SrgProvider extends DependencyProvider {
try {
FileUtils.deleteDirectory(context.workingDirectory("/").toFile());
MojangMappingLayer layer = new MojangMappingsSpec(() -> true).createLayer(context);
MojangMappingLayer layer = new MojangMappingsSpec(() -> true, true).createLayer(context);
layer.visit(visitor);
} catch (IOException e) {
throw new UncheckedIOException(e);

8
src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java
View File

@@ -33,12 +33,12 @@ public record MojangMappingsSpec(SilenceLicenseOption silenceLicense, boolean na
private static final String MANIFEST_CLIENT_MAPPINGS = "client_mappings";
private static final String MANIFEST_SERVER_MAPPINGS = "server_mappings";
public MojangMappingsSpec(SilenceLicenseSupplier supplier) {
this(new SilenceLicenseOption(supplier));
public MojangMappingsSpec(SilenceLicenseSupplier supplier, boolean nameSyntheticMembers) {
this(new SilenceLicenseOption(supplier), nameSyntheticMembers);
}
public MojangMappingsSpec() {
this(() -> false);
public MojangMappingsSpec(boolean nameSyntheticMembers) {
this(() -> false, nameSyntheticMembers);
}
@FunctionalInterface

4
src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpecBuilderImpl.java
View File

@@ -48,7 +48,7 @@ public class MojangMappingsSpecBuilderImpl implements MojangMappingsSpecBuilder
return nameSyntheticMembers;
}
public MojangMappingsSpec build() {
return new MojangMappingsSpec(nameSyntheticMembers);
public MojangMappingsSpec build(MojangMappingsSpec.SilenceLicenseSupplier supplier) {
return new MojangMappingsSpec(supplier, nameSyntheticMembers);
}
}