bug fixes

- fixed error reporting
Skullians · Feb 14, 2024 · 6b7413e · 6b7413e
1 parent aa63ffc
commit 6b7413e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/src/main/java/skullian/binarysearchinator/control/ConfirmationHandler.java b/src/main/java/skullian/binarysearchinator/control/ConfirmationHandler.java
@@ -56,6 +56,7 @@ public void initialize(URL location, ResourceBundle resources) {
 
         jtype = extractor.getType(SidebarController.jarDir, SidebarController.tempDir);
         if (jtype == null) {
+            ErrorHandler.error = "Jar Type returned Null";
             ErrorHandler.setErrorMessage(borderPane);
             return;
         }

diff --git a/src/main/java/skullian/binarysearchinator/control/DecomManager.java b/src/main/java/skullian/binarysearchinator/control/DecomManager.java
@@ -49,7 +49,7 @@ public void initialize(URL location, ResourceBundle resources) {
             extractingField.setText(Extractor.processing);
             dependenciesField.setText(Arrays.toString(Extractor.dependencies));
             if (Extractor.completed) { executorService.shutdown(); }
-        }, 0, 750, TimeUnit.MILLISECONDS);
+        }, 0, 1, TimeUnit.SECONDS);
     }
 
     private void setRotate(Circle c, boolean reverse, int angle, int duration) {
@@ -67,7 +67,7 @@ private void beginExtraction() {
         switch (ConfirmationHandler.jtype) {
 
             case "Forge":
-
+                Extractor.extractForgeMods(ConfirmationHandler.input, ConfirmationHandler.output);
                 break;
             case "Plugin":
                 Extractor.extractPlugins(ConfirmationHandler.input, ConfirmationHandler.output);

diff --git a/src/main/java/skullian/binarysearchinator/util/jar/Extractor.java b/src/main/java/skullian/binarysearchinator/util/jar/Extractor.java
@@ -44,8 +44,20 @@ public String getType(String input, String output) {
             Path jarFilePath = getRandomJarFile(input);
             List<String> toCheck = Arrays.asList("plugin.yml", "fabric.mod.json", "mods.toml", "quilt.mod.json");
             ZipFile jarFile = new ZipFile(jarFilePath.toFile());
-
-            for (String fileName: toCheck) {
+            Enumeration<? extends ZipEntry> entries = jarFile.entries();
+            while (entries.hasMoreElements()) {
+                ZipEntry entry = entries.nextElement();
+                if (entry.getName().contains("mods.toml")) {
+                    return "Forge / NeoForged Mod";
+                } else if (entry.getName().contains("plugin.yml")) {
+                    return "Plugin";
+                } else if (entry.getName().contains("fabric.mod.json")) {
+                    return "Fabric Mod";
+                } else if (entry.getName().contains("quilt.mod.json")) {
+                    return "Quilt Mod";
+                }
+            }
+            /*for (String fileName: toCheck) {
                 ZipEntry entry = jarFile.getEntry(fileName);
                 if (entry != null) {
                     if (fileName.equals("plugin.yml")) {
@@ -58,7 +70,7 @@ public String getType(String input, String output) {
                         return "Quilt Mod";
                     }
                 }
-            }
+            }*/
         } catch (Exception error) {
             ErrorHandler.error = "Failed to get jar type: \n" + error;
             ErrorHandler.setErrorMessage(pane);

diff --git a/src/main/java/skullian/binarysearchinator/util/jar/parsing/ParseJSON.java b/src/main/java/skullian/binarysearchinator/util/jar/parsing/ParseJSON.java
@@ -0,0 +1,4 @@
+package skullian.binarysearchinator.util.jar.parsing;
+
+public class ParseJSON {
+}
diff --git a/src/main/java/skullian/binarysearchinator/util/jar/parsing/ParseTOML.java b/src/main/java/skullian/binarysearchinator/util/jar/parsing/ParseTOML.java
@@ -0,0 +1,4 @@
+package skullian.binarysearchinator.util.jar.parsing;
+
+public class ParseTOML {
+}