fix(commons): some additions + fixed mappings

Author: terminalsin

dev.skidfuscator.obfuscator/commons/src/main/java/dev/skidfuscator/inflator/SkidInflator.java

@@ -10,11 +10,12 @@
 
 @UtilityClass
 public class SkidInflator {
-    private final int ARRAY_SIZE = 1024;
+    private final int ARRAY_SIZE = 1024 * 8;
 
     public byte[] compress(byte[] data) throws IOException {
         final Deflater deflater = new Deflater();
         deflater.setInput(data);
+        deflater.finish();
 
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(data.length);
         final byte[] buffer = new byte[ARRAY_SIZE];
@@ -24,6 +25,7 @@ public byte[] compress(byte[] data) throws IOException {
             outputStream.write(buffer, 0, count);
         }
         outputStream.close();
+        deflater.end();
 
         final byte[] output = outputStream.toByteArray();
 
@@ -42,6 +44,7 @@ public byte[] decompress(byte[] data) throws IOException, DataFormatException {
             outputStream.write(buffer, 0, count);
         }
         outputStream.close();
+        inflater.end();
 
         final byte[] output = outputStream.toByteArray();
 

dev.skidfuscator.obfuscator/commons/src/main/java/dev/skidfuscator/jghost/GhostHelper.java

@@ -56,6 +56,10 @@ private ApplicationClassSource getLibrary(final SkidfuscatorSession session, fin
             library = GhostHelper.readFromLibraryFile(output);
         }
 
+        return importFile(session, library);
+    }
+
+    public ApplicationClassSource importFile(final SkidfuscatorSession session, final GhostLibrary library) {
         /* Create a new library class source with superior to default priority */
         final ApplicationClassSource libraryClassSource = new ApplicationClassSource(
                 "libraries",
@@ -68,7 +72,6 @@ private ApplicationClassSource getLibrary(final SkidfuscatorSession session, fin
         );
         LOGGER.info("[✓] Imported " + library.getContents().getClasses().size() + " library classes...");
 
-
         return libraryClassSource;
     }
 

dev.skidfuscator.obfuscator/commons/src/main/java/dev/skidfuscator/obfuscator/SkidfuscatorSession.java

@@ -42,6 +42,13 @@ public File getLibs() {
         return libs;
     }
 
+    /**
+     * @return the mappings file
+     */
+    public File getMappings() {
+        return mappings;
+    }
+
     /**
      * @return the exempt
      */

dev.skidfuscator.obfuscator/obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java

@@ -1,6 +1,8 @@
 package dev.skidfuscator.obfuscator;
 
+import dev.skidfuscator.jghost.Ghost;
 import dev.skidfuscator.jghost.GhostHelper;
+import dev.skidfuscator.jghost.tree.GhostLibrary;
 import dev.skidfuscator.obfuscator.creator.SkidApplicationClassSource;
 import dev.skidfuscator.obfuscator.creator.SkidCache;
 import dev.skidfuscator.obfuscator.directory.SkiddedDirectory;
@@ -254,7 +256,24 @@ public void run() {
          * This would allow for a lot of cool stuff, including tracking
          * and remote HWIDs.
          */
-        if (session.getLibs() != null && session.getLibs().listFiles() != null) {
+        if (session.getMappings() != null) {
+            final File[] libs = Arrays.stream(session.getMappings().listFiles())
+                    .filter(e -> e.getAbsolutePath().endsWith(".json"))
+                    .toArray(File[]::new);
+
+            LOGGER.post("Importing " + libs.length + " mappings...");
+
+            for (File lib : libs) {
+                final GhostLibrary library = GhostHelper.readFromLibraryFile(lib);
+                final ApplicationClassSource libraryClassSource = GhostHelper.importFile(session, library);
+                /* Add library source to class source */
+                classSource.addLibraries(new LibraryClassSource(
+                        libraryClassSource,
+                        5
+                ));
+            }
+            LOGGER.log("✓ Finished importing mappings!");
+        } else if (session.getLibs() != null && session.getLibs().listFiles() != null) {
             final File[] libs = Arrays.stream(session.getLibs().listFiles())
                     .filter(e -> e.getAbsolutePath().endsWith(".jar"))
                     .toArray(File[]::new);