imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-01 21:17:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix part of #72

Browse Source 
That was caused by two places resolving the configurations too early
before the mod processing had completed:

1. Forge sources remapper in Loom
2. Architectury plugin's runtime transformer file generation
   (see architectury/architectury-plugin#25)
This commit is contained in:
Juuz
2022-03-07 17:46:33 +02:00
parent b1b77c008f
commit 50c1171d10
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
View File

@@ -233,6 +233,19 @@ public final class CompileConfiguration {
}
configureDecompileTasks(project);
if (extension.isForge()) {
// TODO: Find a better place for this?
// This has to be after dependencyManager.handleDependencies() above
// because of https://github.com/architectury/architectury-loom/issues/72.
if (!OperatingSystem.isCIBuild()) {
try {
ForgeSourcesRemapper.addBaseForgeSources(project);
} catch (IOException e) {
e.printStackTrace();
}
}
}
});
finalizedBy(p, "idea", "genIdeaWorkspace");
@@ -299,15 +312,6 @@ public final class CompileConfiguration {
final SrgMinecraftProvider<?> srgMinecraftProvider = jarConfiguration.getSrgMinecraftProviderBiFunction().apply(project, minecraftProvider);
extension.setSrgMinecraftProvider(srgMinecraftProvider);
srgMinecraftProvider.provide(true);
// TODO: Find a better place for this?
if (!OperatingSystem.isCIBuild()) {
try {
ForgeSourcesRemapper.addBaseForgeSources(project);
} catch (IOException e) {
e.printStackTrace();
}
}
}
}