From 017e09cf52bb3cb951f751a1b67a772f0027bde8 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 8 May 2021 19:14:11 +0800 Subject: [PATCH] Fix jar output location Signed-off-by: shedaniel --- .../providers/forge/MinecraftPatchedProvider.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java index 666b8530..5440854f 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java @@ -152,6 +152,8 @@ public class MinecraftPatchedProvider extends DependencyProvider { patchId += "-fabric-mixin"; } + minecraftProvider.setJarSuffix(patchId); + File globalCache = getExtension().getUserCache(); File cache = usesProjectCache() ? getExtension().getProjectPersistentCache() : globalCache; File globalDir = new File(globalCache, patchId); @@ -463,6 +465,7 @@ public class MinecraftPatchedProvider extends DependencyProvider { } private void patchJars(Logger logger) throws IOException { + Stopwatch stopwatch = Stopwatch.createStarted(); logger.lifecycle(":patching jars"); PatchProvider patchProvider = getExtension().getPatchProvider(); @@ -473,6 +476,8 @@ public class MinecraftPatchedProvider extends DependencyProvider { copyMissingClasses(environment.srgJar.apply(this), environment.patchedSrgJar.apply(this)); fixParameterAnnotation(environment.patchedSrgJar.apply(this)); }); + + logger.lifecycle(":patched jars in " + stopwatch.stop()); } private void patchJars(File clean, File output, Path patches) throws IOException { @@ -512,7 +517,7 @@ public class MinecraftPatchedProvider extends DependencyProvider { private void walkFileSystems(File source, File target, Predicate filter, Function> toWalk, FsPathConsumer action) throws IOException { try (FileSystemUtil.FileSystemDelegate sourceFs = FileSystemUtil.getJarFileSystem(source, false); - FileSystemUtil.FileSystemDelegate targetFs = FileSystemUtil.getJarFileSystem(target, false)) { + FileSystemUtil.FileSystemDelegate targetFs = FileSystemUtil.getJarFileSystem(target, false)) { for (Path sourceDir : toWalk.apply(sourceFs.get())) { Path dir = sourceDir.toAbsolutePath(); Files.walk(dir)