hibiscus-client
/
fabric-loom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix temp dir not being deleted after use

dev/0.11
modmuss50 2016-10-12 19:41:10 +01:00
parent ca963664e6
commit a2903acd3b
No known key found for this signature in database
GPG Key ID: 203A5ED4D3E48BEA
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/fabricmc/loom/task/MapJarsTask.java
View File

@ -39,6 +39,7 @@ import net.fabricmc.loom.util.Constants;
import org.gradle.api.DefaultTask; import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import org.zeroturnaround.zip.ZipUtil; import org.zeroturnaround.zip.ZipUtil;
import org.zeroturnaround.zip.commons.FileUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -63,6 +64,10 @@ public class MapJarsTask extends DefaultTask {
writeJar(Constants.MINECRAFT_MAPPED_JAR.get(extension), new ProgressListener(), deobfuscator); writeJar(Constants.MINECRAFT_MAPPED_JAR.get(extension), new ProgressListener(), deobfuscator);
File tempAssests = new File(Constants.CACHE_FILES, "tempAssets"); 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 -> { ZipUtil.unpack(Constants.MINECRAFT_CLIENT_JAR.get(extension), tempAssests, name -> {
if (name.startsWith("assets") || name.startsWith("log4j2.xml") || name.startsWith("pack.png")) { 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.unpack(Constants.MINECRAFT_MAPPED_JAR.get(extension), tempAssests);
ZipUtil.pack(tempAssests, Constants.MINECRAFT_MAPPED_JAR.get(extension)); ZipUtil.pack(tempAssests, Constants.MINECRAFT_MAPPED_JAR.get(extension));
FileUtils.deleteDirectory(tempAssests);
} else { } else {
this.getLogger().lifecycle(Constants.MINECRAFT_MAPPED_JAR.get(extension).getAbsolutePath()); this.getLogger().lifecycle(Constants.MINECRAFT_MAPPED_JAR.get(extension).getAbsolutePath());
this.getLogger().lifecycle(":mapped jar found, skipping mapping"); this.getLogger().lifecycle(":mapped jar found, skipping mapping");