fix jbytemod changing empty file names and removing empty directories

(#62)
GraxCode · Aug 29, 2018 · c404204 · c404204 · MadTooth · Aug 30, 2018
1 parent 64e9628
commit c404204
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/me/grax/jbytemod/decompiler/KrakatauDecompiler.java b/src/main/java/me/grax/jbytemod/decompiler/KrakatauDecompiler.java
@@ -99,7 +99,7 @@ private String escape(String absolutePath) {
 
   private File createTempJar(byte[] b) {
     File temp = new File(tempDir, b.hashCode() + ".jar");
-    JarUtils.saveAsJar(Collections.singletonMap(cn.name, b), temp.getAbsolutePath());
+    JarUtils.saveAsJar(Collections.singletonMap(cn.name + ".class", b), temp.getAbsolutePath());
     return temp;
   }
 

diff --git a/src/main/java/me/grax/jbytemod/utils/task/LoadTask.java b/src/main/java/me/grax/jbytemod/utils/task/LoadTask.java
@@ -90,6 +90,7 @@ private void readJar(JarFile jar, JarEntry en, Map<String, ClassNode> classes, M
     publish((int) (((float) loaded++ / (float) jarSize) * 100f));
     String name = en.getName();
     try (InputStream jis = jar.getInputStream(en)) {
+      System.out.println(name + " " + en.isDirectory());
       if (name.endsWith(".class")) {
         byte[] bytes = IOUtils.toByteArray(jis);
         String cafebabe = String.format("%02X%02X%02X%02X", bytes[0], bytes[1], bytes[2], bytes[3]);
@@ -104,9 +105,13 @@ private void readJar(JarFile jar, JarEntry en, Map<String, ClassNode> classes, M
             JByteMod.LOGGER.err("Failed loading class file " + name);
           }
         }
-      } else if (!en.isDirectory()) {
-        byte[] bytes = IOUtils.toByteArray(jis);
-        otherFiles.put(name, bytes);
+      } else {
+        if (!en.isDirectory()) {
+          byte[] bytes = IOUtils.toByteArray(jis);
+          otherFiles.put(name, bytes);
+        } else {
+          otherFiles.put(name, new byte[0]);
+        }
       }
       if (memoryWarning) {
         long timeDif = System.currentTimeMillis() - ms;

diff --git a/src/main/java/me/grax/jbytemod/utils/task/SaveTask.java b/src/main/java/me/grax/jbytemod/utils/task/SaveTask.java
@@ -53,7 +53,7 @@ protected Void doInBackground() throws Exception {
         ClassNode node = classes.get(s);
         ClassWriter writer = new ClassWriter(flags);
         node.accept(writer);
-        outputBytes.put(s, writer.toByteArray());
+        outputBytes.put(s + ".class", writer.toByteArray());
         publish((int) ((i++ / size) * 50d));
       }
       publish(50);

diff --git a/src/main/java/me/lpk/util/JarUtils.java b/src/main/java/me/lpk/util/JarUtils.java
@@ -128,9 +128,9 @@ public static void saveAsJar(Map<String, byte[]> outBytes, String fileName) {
     try {
       JarOutputStream out = new JarOutputStream(new java.io.FileOutputStream(fileName));
       for (String entry : outBytes.keySet()) {
-        String ext = entry.contains(".") ? "" : ".class";
-        out.putNextEntry(new ZipEntry(entry + ext));
-        out.write(outBytes.get(entry));
+        out.putNextEntry(new ZipEntry(entry));
+        if (!entry.endsWith("/"))
+          out.write(outBytes.get(entry));
         out.closeEntry();
       }
       out.close();