Cleaned up MangoBotLaunchTarget stuff...

Author: RealMangorage

src/main/java/org/mangorage/mangobotlaunch/launch/ClassTransformers.java

@@ -12,12 +12,9 @@
 
 public final class ClassTransformers {
     private final Map<String, Class<?>> classes = new ConcurrentHashMap<>();
-    private final List<IClassTransformer> transformers = new CopyOnWriteArrayList<>(); // Transformer's
-    private final ClassLoader loader;
+    private final List<IClassTransformer> transformers = new CopyOnWriteArrayList<>();
 
-    ClassTransformers(ClassLoader loader) {
-        this.loader = loader;
-    }
+    ClassTransformers() {}
 
     void add(String name, Class<?> clz) {
         classes.put(name, clz);
@@ -31,7 +28,7 @@ boolean isEmpty() {
         return transformers.isEmpty();
     }
 
-    byte[] transform(String name, byte[] classData) {;
+    byte[] transform(String name, byte[] classData) {
 
         AtomicReference<TransformResult> result = new AtomicReference<>(TransformerFlag.NO_REWRITE.of(classData));
         AtomicReference<IClassTransformer> _transformer = new AtomicReference<>();

src/main/java/org/mangorage/mangobotlaunch/launch/LoadedModule.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.lang.module.ModuleReader;
 import java.lang.module.ModuleReference;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.security.CodeSigner;
 import java.security.CodeSource;
@@ -11,25 +12,31 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-public final class LoadedModule implements ModuleReader {
+public final class LoadedModule {
     private final List<LoadedModule> children = new ArrayList<>();
 
     private final ModuleReference moduleReference;
-    private final ModuleReader moduleReader;
     private final CodeSource codeSource;
 
-    LoadedModule(ModuleReference moduleReference) throws IOException {
+    LoadedModule(ModuleReference moduleReference) {
         this.moduleReference = moduleReference;
-        this.moduleReader = moduleReference.open();
-        this.codeSource = new CodeSource(moduleReference.location().get().toURL(), (CodeSigner[]) null);
+        try {
+            this.codeSource = new CodeSource(moduleReference.location().get().toURL(), (CodeSigner[]) null);
+        } catch (MalformedURLException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     ModuleReference getModuleReference() {
         return moduleReference;
     }
 
     ModuleReader getModuleReader() {
-        return moduleReader;
+        try {
+            return moduleReference.open();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     CodeSource getCodeSource() {
@@ -44,7 +51,6 @@ String name() {
         return getModuleReference().descriptor().name();
     }
 
-    @Override
     public Optional<URI> find(String name) throws IOException {
         final var optional = getModuleReader().find(name);
         if (optional.isPresent()) return optional;
@@ -57,14 +63,4 @@ public Optional<URI> find(String name) throws IOException {
 
         return Optional.empty();
     }
-
-    @Override
-    public Stream<String> list() throws IOException {
-        return Stream.empty();
-    }
-
-    @Override
-    public void close() throws IOException {
-
-    }
 }

src/main/java/org/mangorage/mangobotlaunch/launch/MangoBotDependencyLocator.java

@@ -2,7 +2,7 @@
 
 import org.mangorage.bootstrap.api.dependency.IDependency;
 import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
-import org.mangorage.mangobotlaunch.DependencyHandler;
+import org.mangorage.mangobotlaunch.util.handler.DependencyHandler;
 
 import java.nio.file.Path;
 import java.util.List;

src/main/java/org/mangorage/mangobotlaunch/launch/MangoBotLaunchTarget.java

@@ -23,52 +23,13 @@
 
 public final class MangoBotLaunchTarget implements ILaunchTarget {
 
-    /**
-     * Deletes the target directory if it exists, then copies all files from the list into it.
-     *
-     * @param files      List of files to copy
-     * @param targetDir  Directory to copy files into
-     * @throws IOException if anything goes wrong
-     */
-    public static void copyFilesToDirectory(List<Path> files, Path targetDir) throws IOException {
-        // Delete directory if it exists
-        if (Files.exists(targetDir)) {
-            deleteDirectoryRecursively(targetDir);
-        }
-
-        // Recreate the empty directory
-        Files.createDirectories(targetDir);
-
-        // Copy each file
-        for (Path file : files) {
-            if (!Files.isRegularFile(file)) continue; // skip garbage
-            Path dest = targetDir.resolve(file.getFileName());
-            Files.copy(file, dest, StandardCopyOption.REPLACE_EXISTING);
-        }
-    }
-
-    private static void deleteDirectoryRecursively(Path dir) throws IOException {
-        if (!Files.exists(dir)) return;
-
-        // Walk the directory bottom-up and delete everything
-        Files.walk(dir)
-                .sorted(Comparator.reverseOrder()) // delete children first
-                .forEach(path -> {
-                    try {
-                        Files.delete(path);
-                    } catch (IOException e) {
-                        throw new RuntimeException("Failed to delete " + path, e);
-                    }
-                });
-    }
-
     @Override
     public String getId() {
         return "mangobot";
     }
 
     @Override
-    public void launch(ModuleLayer bootstrapLayer, ModuleLayer parent, String[] args) throws Throwable {
+    public void launch(ModuleLayer bootstrapLayer, ModuleLayer parent, String[] args) {
         final var pluginsPath = Path.of("plugins");
 
         List<IDependencyLocator> dependencyLocators = ServiceLoader.load(bootstrapLayer, IDependencyLocator.class)