From a2903acd3b4825956726ae6436e0306ed521725c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 12 Oct 2016 19:41:10 +0100 Subject: [PATCH] Fix temp dir not being deleted after use --- src/main/java/net/fabricmc/loom/task/MapJarsTask.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java index 7bb95e7f..3df77533 100644 --- a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java +++ b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java @@ -39,6 +39,7 @@ import net.fabricmc.loom.util.Constants; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; import org.zeroturnaround.zip.ZipUtil; +import org.zeroturnaround.zip.commons.FileUtils; import java.io.File; import java.io.IOException; @@ -63,6 +64,10 @@ public class MapJarsTask extends DefaultTask { writeJar(Constants.MINECRAFT_MAPPED_JAR.get(extension), new ProgressListener(), deobfuscator); File tempAssests = new File(Constants.CACHE_FILES, "tempAssets"); + if(tempAssests.exists()){ + FileUtils.deleteDirectory(tempAssests); + } + tempAssests.mkdir(); ZipUtil.unpack(Constants.MINECRAFT_CLIENT_JAR.get(extension), tempAssests, name -> { if (name.startsWith("assets") || name.startsWith("log4j2.xml") || name.startsWith("pack.png")) { @@ -74,6 +79,7 @@ public class MapJarsTask extends DefaultTask { ZipUtil.unpack(Constants.MINECRAFT_MAPPED_JAR.get(extension), tempAssests); ZipUtil.pack(tempAssests, Constants.MINECRAFT_MAPPED_JAR.get(extension)); + FileUtils.deleteDirectory(tempAssests); } else { this.getLogger().lifecycle(Constants.MINECRAFT_MAPPED_JAR.get(extension).getAbsolutePath()); this.getLogger().lifecycle(":mapped jar found, skipping mapping");