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

Inject Forge earlier to remap its SRG names to Yarn

Browse Source
This commit is contained in:
Juuxel
2020-07-27 20:40:59 +03:00
parent 38721a3f8c
commit d062055eaf
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
View File

@@ -133,7 +133,8 @@ public class MinecraftProvider extends DependencyProvider {
patchJars(getProject().getLogger());
}
createPatchedJars(getProject().getLogger());
injectForgeClasses(getProject().getLogger());
remapPatchedJars(getProject().getLogger());
}
if (!minecraftMergedJar.exists() || isRefreshDeps()) {
@@ -258,7 +259,13 @@ public class MinecraftProvider extends DependencyProvider {
}
}
private void createPatchedJars(Logger logger) throws IOException {
private void injectForgeClasses(Logger logger) throws IOException {
logger.lifecycle(":adding forge classes");
copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftClientPatchedSrgJar);
copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftServerPatchedSrgJar);
}
private void remapPatchedJars(Logger logger) throws IOException {
logger.lifecycle(":remapping minecraft (Atlas, srg -> official)");
useAtlas(MappingSet::reverse, atlas -> {
@@ -317,9 +324,6 @@ public class MinecraftProvider extends DependencyProvider {
copyNonClassFiles(minecraftClientJar, minecraftMergedJar);
copyNonClassFiles(minecraftServerJar, minecraftMergedJar);
logger.lifecycle(":adding forge classes");
copyAll(getExtension().getForgeUniversalProvider().getForge(), minecraftMergedJar);
/*try (JarMerger jarMerger = new JarMerger(minecraftClientPatchedJar, minecraftServerPatchedJar, minecraftMergedJar)) {
jarMerger.enableSyntheticParamsOffset();
jarMerger.merge();