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

Fix walkFileSystems with non-root source directories

Browse Source
This commit is contained in:
Juuxel
2020-11-30 15:32:48 +02:00
parent f3dd0c4999
commit d52caa4ae0
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,19 +352,16 @@ public class MinecraftProvider extends DependencyProvider {
private void walkFileSystems(File source, File target, Predicate<Path> filter, Function<FileSystem, Iterable<Path>> toWalk, FsPathConsumer action) throws IOException {
try (FileSystem sourceFs = FileSystems.newFileSystem(new URI("jar:" + source.toURI()), ImmutableMap.of("create", false));
FileSystem targetFs = FileSystems.newFileSystem(new URI("jar:" + target.toURI()), ImmutableMap.of("create", false))) {
for (Path rootDirectory : toWalk.apply(sourceFs)) {
java.nio.file.Files.walk(rootDirectory)
for (Path sourceDir : toWalk.apply(sourceFs)) {
Path dir = sourceDir.toAbsolutePath();
java.nio.file.Files.walk(dir)
.filter(java.nio.file.Files::isRegularFile)
.filter(filter)
.forEach(it -> {
boolean actuallyRoot = rootDirectory.getParent() == null;
if (!actuallyRoot) {
System.out.printf("%s relativizes %s to %s%n", rootDirectory, it, rootDirectory.relativize(it));
}
boolean root = dir.getParent() == null;
try {
action.accept(sourceFs, targetFs, actuallyRoot ? it : rootDirectory.relativize(it));
action.accept(sourceFs, targetFs, root ? it : dir.relativize(it));
} catch (IOException e) {
throw new UncheckedIOException(e);
}