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

Ensure all mercury classpath entries exist. Fixes a mmigrateMappings crash in some multi-project setups.

Browse Source
This commit is contained in:
modmuss50
2022-07-08 20:28:52 +01:00
parent aa77ad8c4c
commit 991628d619
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/fabricmc/loom/util/SourceRemapper.java
View File

@@ -227,24 +227,32 @@ public class SourceRemapper {
m.setGracefulClasspathChecks(true);
m.setSourceCompatibility(Constants.MERCURY_SOURCE_VERSION);
final List<Path> classPath = new ArrayList<>();
for (File file : project.getConfigurations().getByName(Constants.Configurations.LOADER_DEPENDENCIES).getFiles()) {
m.getClassPath().add(file.toPath());
classPath.add(file.toPath());
}
if (!toNamed) {
for (File file : project.getConfigurations().getByName("compileClasspath").getFiles()) {
m.getClassPath().add(file.toPath());
classPath.add(file.toPath());
}
} else {
final LoomGradleExtension extension = LoomGradleExtension.get(project);
for (RemapConfigurationSettings entry : extension.getRemapConfigurations()) {
for (File inputFile : entry.getSourceConfiguration().get().getFiles()) {
m.getClassPath().add(inputFile.toPath());
classPath.add(inputFile.toPath());
}
}
}
for (Path path : classPath) {
if (Files.exists(path)) {
m.getClassPath().add(path);
}
}
return m;
}