Improved how we handle dependencies, no longer need to worry about a "sorted-libraries" folder...

Author: RealMangorage

build.gradle

@@ -28,7 +28,7 @@ apply plugin: 'com.gradleup.shadow'
 
 
 group = 'org.mangorage'
-version = getLatestGitTag() + "." + getLatestGitVersion()
+version = getLatestGitTag() + "." + getLatestGitVersion() + "-beta.1"
 
 println("Version -> " + version)
 

src/main/java/org/mangorage/bootstrap/internal/JarHandler.java

@@ -57,6 +57,25 @@ public static Result resolveModuleName(Path jarPath) {
                     );
                 }
 
+                try {
+                    System.out.println("MAYBE!?");
+                    final var found = ModuleFinder.of(jarPath).findAll();
+                    System.out.println(found);
+                    if (found != null) {
+                        final var foundModule = found.stream().findAny();
+                        if (foundModule.isPresent())
+                            System.out.println(foundModule.get());
+                        return new Result(
+                                foundModule.get().descriptor().name(),
+                                ModuleNameOrigin.MODULE_FINDER,
+                                jarPath
+                        );
+                    }
+                } catch (Exception ignore) {
+                    ignore.printStackTrace();
+                }
+
+
                 String symbolicName = manifest.getMainAttributes()
                         .getValue("Bundle-SymbolicName");
 
@@ -72,10 +91,14 @@ public static Result resolveModuleName(Path jarPath) {
 
             // 3. Fallback: filename heuristic (aka desperation mode)
             String filename = jarPath.getFileName().toString();
+
+            String cleanedName = filename
+                    .replaceAll("-[\\d\\.]+.*\\.jar$", "") // Remove version and extension
+                    .replaceAll("\\.jar$", "")             // Remove extension if no version
+                    .replace('-', '.');                    // Convert hyphens to dots
+
             return new Result(
-                    filename
-                            .replaceAll("-[\\d\\.]+.*\\.jar$", "")
-                            .replaceAll("\\.jar$", ""),
+                    cleanedName,
                     ModuleNameOrigin.GUESSED,
                     jarPath
             );

src/main/java/org/mangorage/bootstrap/internal/MangoBotLaunchTarget.java

@@ -69,7 +69,6 @@ public void launch(ModuleLayer parent, String[] args) throws Throwable {
         final var librariesPath = Path.of("libraries");
         final var pluginsPath = Path.of("plugins");
 
-
         final Map<String, List<Result>> dependencies = DependencyHandler.scanPackages(pluginsPath.toAbsolutePath(), librariesPath.toAbsolutePath());
         final Map<String, Result> finalDependencies = new HashMap<>();
 
@@ -80,23 +79,28 @@ public void launch(ModuleLayer parent, String[] args) throws Throwable {
             finalDependencies.put(bestResult.name(), bestResult);
         });
 
-        Path sortedLibraries = Path.of("sorted-libraries").toAbsolutePath();
-        final var list = finalDependencies.entrySet()
-                .stream()
-                .map(entry -> entry.getValue().jar())
-                .toList();
-
-        copyFilesToDirectory(list, sortedLibraries);
-
         Set<String> moduleNames = new HashSet<>();
         moduleNames.addAll(Util.getModuleNames(pluginsPath));
-        moduleNames.addAll(Util.getModuleNames(sortedLibraries));
+        moduleNames.addAll(finalDependencies.keySet());
 
-        moduleNames.remove("kotlin-stdlib-common");
+        System.out.println("Module Info");
+        System.out.println("----------------------------------------------");
+        moduleNames.forEach(name -> {
+            System.out.println("Module Name -> " + name);
+        });
+        System.out.println("----------------------------------------------");
+        System.out.println("Module -> Jar Info");
+        System.out.println("----------------------------------------------");
+        finalDependencies.forEach((module, result) -> {
+            System.out.println("Module -> " + module + " Jar -> " + result.jar() + " Name -> " + result.name() + " Origin -> " + result.origin());
+        });
+        System.out.println("----------------------------------------------");
 
         final var moduleCfg = Configuration.resolve(
                 ModuleFinder.of(
-                        sortedLibraries
+                        finalDependencies.entrySet().stream()
+                                .map(entry -> entry.getValue().jar())
+                                .toArray(Path[]::new)
                 ),
                 List.of(
                         parent.configuration()

src/main/java/org/mangorage/bootstrap/internal/util/ModuleNameOrigin.java

@@ -5,5 +5,6 @@ public enum ModuleNameOrigin {
     MULTI_RELEASE, // HIGH
     MANIFEST, // MEDIUM
     MANIFEST_BUNDLE_SYMBOLIC_NAME, // LOW
-    GUESSED // LOWEST
+    MODULE_FINDER, // LOWEST
+    GUESSED // TOTAL LOWEST
 }