From d07c06e7881046269b48e509a3dd51210a4c07ec Mon Sep 17 00:00:00 2001 From: OmeWillem Date: Thu, 4 Jul 2024 21:02:03 +0200 Subject: [PATCH] Actually made automatic resourcepacks working lol. --- .../imc/geysermodelenginepackgenerator/ExtensionMain.java | 2 +- .../imc/geysermodelenginepackgenerator/util/ZipUtil.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java b/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java index b56a3ac..32e44f3 100644 --- a/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java +++ b/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java @@ -36,7 +36,7 @@ public class ExtensionMain implements Extension { try (ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(generatedPackZip))) { // 压缩文件夹 - ZipUtil.compressFolder(generatedPack, generatedPack.getName(), zipOutputStream); + ZipUtil.compressFolder(generatedPack, null, zipOutputStream); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/util/ZipUtil.java b/src/main/java/re/imc/geysermodelenginepackgenerator/util/ZipUtil.java index d51d5c1..cfd4a21 100644 --- a/src/main/java/re/imc/geysermodelenginepackgenerator/util/ZipUtil.java +++ b/src/main/java/re/imc/geysermodelenginepackgenerator/util/ZipUtil.java @@ -13,8 +13,16 @@ public class ZipUtil { if (files != null) { for (File file : files) { if (file.isDirectory()) { + if (folderName == null) { + compressFolder(file, file.getName(), zipOutputStream); + continue; + }; compressFolder(file, folderName + "/" + file.getName(), zipOutputStream); } else { + if (folderName == null) { + addToZipFile(file.getName(), file, zipOutputStream); + continue; + }; addToZipFile(folderName + "/" + file.getName(), file, zipOutputStream); } }