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

Try to fix copyUserdevFiles for real

Browse Source
This commit is contained in:
Juuxel
2020-07-30 17:38:09 +03:00
parent 2f8946ed01
commit 74516ee6c0
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,10 @@ import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.Collections;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import java.util.zip.ZipError;
@@ -347,16 +349,18 @@ public class MinecraftProvider extends DependencyProvider {
}
}
private void walkFileSystems(File source, File target, Predicate<Path> filter, FsPathConsumer action) throws IOException {
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 : sourceFs.getRootDirectories()) {
for (Path rootDirectory : toWalk.apply(sourceFs)) {
java.nio.file.Files.walk(rootDirectory)
.filter(java.nio.file.Files::isRegularFile)
.filter(filter)
.forEach(it -> {
boolean actuallyRoot = rootDirectory.getParent() == null;
try {
action.accept(sourceFs, targetFs, it);
action.accept(sourceFs, targetFs, actuallyRoot ? it : rootDirectory.relativize(it));
} catch (IOException e) {
throw new UncheckedIOException(e);
}
@@ -367,6 +371,10 @@ public class MinecraftProvider extends DependencyProvider {
}
}
private void walkFileSystems(File source, File target, Predicate<Path> filter, FsPathConsumer action) throws IOException {
walkFileSystems(source, target, filter, FileSystem::getRootDirectories, action);
}
private void copyAll(File source, File target) throws IOException {
walkFileSystems(source, target, it -> true, this::copyReplacing);
}
@@ -402,19 +410,15 @@ public class MinecraftProvider extends DependencyProvider {
}
private void copyUserdevFiles(File source, File target) throws IOException {
walkFileSystems(source, target, java.nio.file.Files::isRegularFile, (sourceFs, targetFs, it) -> {
Path inject = sourceFs.getPath("inject");
walkFileSystems(source, target, java.nio.file.Files::isRegularFile, fs -> Collections.singleton(fs.getPath("inject")), (sourceFs, targetFs, it) -> {
Path targetPath = targetFs.getPath(it.toString());
Path parent = targetPath.getParent();
if (it.toString().startsWith(inject.toString())) {
Path targetPath = targetFs.getPath(inject.relativize(it).toString());
Path parent = targetPath.getParent();
if (parent != null) {
java.nio.file.Files.createDirectories(parent);
}
java.nio.file.Files.copy(it, targetPath);
if (parent != null) {
java.nio.file.Files.createDirectories(parent);
}
java.nio.file.Files.copy(it, targetPath);
});
}