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

Clean up FsPathConsumer

Browse Source
This commit is contained in:
Juuxel
2020-07-30 15:01:20 +03:00
parent a44bdba5d6
commit f55bde4ece
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,8 +352,10 @@ public class MinecraftProvider extends DependencyProvider {
.filter(java.nio.file.Files::isRegularFile)
.filter(filter)
.forEach(it -> {
Path targetPath = targetFs.getPath(it.toString());
try {
action.accept(sourceFs, targetFs, it);
action.accept(sourceFs, targetFs, it, targetPath);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
@@ -369,17 +371,15 @@ public class MinecraftProvider extends DependencyProvider {
}
private void copyMissingClasses(File source, File target) throws IOException {
walkFileSystems(source, target, it -> it.toString().endsWith(".class"), (sourceFs, targetFs, it) -> {
Path targetFile = targetFs.getPath(it.toString());
if (java.nio.file.Files.exists(targetFile)) return;
Path parent = targetFile.getParent();
walkFileSystems(source, target, it -> it.toString().endsWith(".class"), (sourceFs, targetFs, sourcePath, targetPath) -> {
if (java.nio.file.Files.exists(targetPath)) return;
Path parent = targetPath.getParent();
if (parent != null) {
java.nio.file.Files.createDirectories(parent);
}
java.nio.file.Files.copy(it, targetFile);
java.nio.file.Files.copy(sourcePath, targetPath);
});
}
@@ -387,15 +387,14 @@ public class MinecraftProvider extends DependencyProvider {
walkFileSystems(source, target, it -> !it.toString().endsWith(".class"), this::copyReplacing);
}
private void copyReplacing(FileSystem sourceFs, FileSystem targetFs, Path it) throws IOException {
Path targetFile = targetFs.getPath(it.toString());
Path parent = targetFile.getParent();
private void copyReplacing(FileSystem sourceFs, FileSystem targetFs, Path sourcePath, Path targetPath) throws IOException {
Path parent = targetPath.getParent();
if (parent != null) {
java.nio.file.Files.createDirectories(parent);
}
java.nio.file.Files.copy(it, targetFile, StandardCopyOption.REPLACE_EXISTING);
java.nio.file.Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
}
public File getMergedJar() {

4
src/main/java/net/fabricmc/loom/util/FsPathConsumer.java
View File

@@ -29,11 +29,11 @@ import java.nio.file.FileSystem;
import java.nio.file.Path;
/**
* Like Consumer, but can throw IOException and gets access to two file systems.
* Consumes two file systems and an equivalent path object for both of them.
*
* @author Juuz
*/
@FunctionalInterface
public interface FsPathConsumer {
void accept(FileSystem sourceFs, FileSystem targetFs, Path path) throws IOException;
void accept(FileSystem sourceFs, FileSystem targetFs, Path sourcePath, Path targetPath) throws IOException;
}