diff options
| author | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-11-30 21:13:10 +0200 |
|---|---|---|
| committer | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-11-30 21:13:10 +0200 |
| commit | 702cf11d3336b5b6f6bdcdb0be81ad116fbbbfdf (patch) | |
| tree | 3e89e6d7287a6dba034905e163dd8d856a6ef55d /src/main | |
| parent | 76a171556e0519cb2f6dd9f004ec12aec2a9e173 (diff) | |
| download | architectury-loom-702cf11d3336b5b6f6bdcdb0be81ad116fbbbfdf.tar.gz architectury-loom-702cf11d3336b5b6f6bdcdb0be81ad116fbbbfdf.tar.bz2 architectury-loom-702cf11d3336b5b6f6bdcdb0be81ad116fbbbfdf.zip | |
Shade tiny mappings parser inside the injection jar, add launch property for the mapping path
Diffstat (limited to 'src/main')
3 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java index 3cfa4321..6ee8d180 100644 --- a/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java @@ -70,6 +70,8 @@ public class LaunchProvider extends DependencyProvider { if (getExtension().isForge()) { launchConfig + .property("fabric.yarnWithSrg.path", getExtension().getMappingsProvider().tinyMappingsWithSrg.toAbsolutePath().toString()) + .argument("--fml.mcVersion") .argument(getExtension().getMinecraftProvider().getMinecraftVersion()) .argument("--fml.forgeVersion") diff --git a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java index e116a451..f31e609f 100644 --- a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java @@ -78,7 +78,7 @@ public class MappingsProvider extends DependencyProvider { public File tinyMappings; public File tinyMappingsJar; public File mappingsMixinExport; - private Path tinyMappingsWithSrg; + public Path tinyMappingsWithSrg; public MappingsProvider(Project project) { super(project); diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java index 25cfce42..ab93c5b8 100644 --- a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java @@ -290,8 +290,8 @@ public class MinecraftProvider extends DependencyProvider { FileUtils.copyInputStreamToFile(in, injection); } - copyAll(injection, minecraftClientPatchedSrgJar); - copyAll(injection, minecraftServerPatchedSrgJar); + walkFileSystems(injection, minecraftClientPatchedSrgJar, it -> !it.getFileName().toString().equals("MANIFEST.MF"), this::copyReplacing); + walkFileSystems(injection, minecraftServerPatchedSrgJar, it -> !it.getFileName().toString().equals("MANIFEST.MF"), this::copyReplacing); } private void remapPatchedJars(Logger logger) throws IOException { |