fix resources with zip downgrader

unimined · Mar 27, 2024 · beb04b1 · beb04b1
1 parent 61d906c
commit beb04b1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/downgradetest/src/main/resources/test/testResource2.txt b/downgradetest/src/main/resources/test/testResource2.txt
@@ -0,0 +1 @@
+another test contents
diff --git a/downgradetest/src/main/resources/testResource.txt b/downgradetest/src/main/resources/testResource.txt
@@ -0,0 +1 @@
+test resource contents
diff --git a/src/main/java/xyz/wagyourtail/jvmdg/compile/ZipDowngrader.java b/src/main/java/xyz/wagyourtail/jvmdg/compile/ZipDowngrader.java
@@ -50,6 +50,18 @@ public static void downgradeZip(final ClassDowngrader downgrader, Path zip, Set<
         final URLClassLoader extraClasspath = new URLClassLoader(classpath.toArray(new URL[0]), ZipDowngrader.class.getClassLoader());
         try (final FileSystem zipfs = Utils.openZipFileSystem(zip, new HashMap<String, Object>())) {
             try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(output))) {
+                // write manifest seperately, since it's supposed to be first
+                Path manifest = zipfs.getPath("META-INF/MANIFEST.MF");
+                if (Files.exists(manifest)) {
+                    byte[] bytes = Utils.readAllBytes(Files.newInputStream(manifest));
+                    ZipEntry newEntry = new ZipEntry("META-INF/MANIFEST.MF");
+                    newEntry.setTime(Files.getLastModifiedTime(manifest).toMillis());
+                    zos.putNextEntry(newEntry);
+                    zos.write(bytes);
+                    zos.flush();
+                    zos.closeEntry();
+                }
+
                 Files.walkFileTree(zipfs.getPath("/"), new FileVisitor<Path>() {
                     @Override
                     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
@@ -115,13 +127,8 @@ public byte[] apply(String s) {
                                 } catch (IllegalClassFormatException e) {
                                     throw new IOException("Failed to downgrade class", e);
                                 }
-                            } else {
-                                String fileName = file.getFileName().toString();
-                                // remove leading /
-                                if (fileName.startsWith("/")) {
-                                    fileName = fileName.substring(1);
-                                }
-                                ZipEntry newEntry = new ZipEntry(fileName);
+                            } else if (!file.toString().equals("/META-INF/MANIFEST.MF")) {
+                                ZipEntry newEntry = new ZipEntry(file.toString().substring(1));
                                 newEntry.setTime(attrs.lastModifiedTime().toMillis());
                                 zos.putNextEntry(newEntry);
                                 zos.write(bytes);