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

Fix "merging" the jar twice

Browse Source
This commit is contained in:
Juuxel
2021-06-29 12:37:24 +03:00
parent 17dc301d07
commit f7731572d1
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
View File

@@ -251,11 +251,7 @@ public class MinecraftPatchedProvider extends DependencyProvider {
}
if (dirty) {
remapPatchedJars(getProject().getLogger());
}
if (dirty || !minecraftMergedPatchedJar.exists()) {
mergeJars(getProject().getLogger());
remapPatchedJar(getProject().getLogger());
}
this.filesDirty = dirty;
@@ -431,7 +427,7 @@ public class MinecraftPatchedProvider extends DependencyProvider {
}
}
private void remapPatchedJars(Logger logger) throws Exception {
private void remapPatchedJar(Logger logger) throws Exception {
Path[] libraries = MinecraftMappedProvider.getRemapClasspath(getProject());
logger.lifecycle(":remapping minecraft (TinyRemapper, srg -> official)");
TinyTree mappingsWithSrg = getExtension().getMappingsProvider().getMappingsWithSrg();