diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-11-29 01:54:17 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-11-29 01:54:17 +0800 |
| commit | 152d2801e46c570db3c0a83ae46ca5364f53ee44 (patch) | |
| tree | 8cdcbb03e220e8b7baaf0de85543d35df3fbe1ff /src/main/java | |
| parent | d51b44cdaa130389fb2054f43ed20a33a5ef8389 (diff) | |
| download | architectury-loom-152d2801e46c570db3c0a83ae46ca5364f53ee44.tar.gz architectury-loom-152d2801e46c570db3c0a83ae46ca5364f53ee44.tar.bz2 architectury-loom-152d2801e46c570db3c0a83ae46ca5364f53ee44.zip | |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java index 53de273b..32a12dc6 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java @@ -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); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java index e6bba1a9..43b33c24 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java @@ -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 diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpecBuilderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpecBuilderImpl.java index 7937ad1f..fd7c15ad 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpecBuilderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpecBuilderImpl.java @@ -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); } } |