reconfigure implementation projects

common/implementation/base/build.gradle.kts

@@ -1,6 +1,6 @@
 dependencies {
     "shadedApi"(project(":common:api"))
-    "shadedApi"(project(":common:loader:addon"))
+    "shadedApi"(project(":common:implementation:bootstrap-addon-loader"))
     
     "shadedApi"("org.apache.commons:commons-rng-core:1.3")
     "shadedApi"("commons-io:commons-io:2.6")

common/implementation/base/src/main/java/com/dfsek/terra/event/EventManagerImpl.java

@@ -20,7 +20,6 @@ package com.dfsek.terra.event;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.event.EventHandler;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.events.Event;

common/implementation/bootstrap-addon-loader/build.gradle.kts

@@ -0,0 +1,3 @@
+dependencies {
+    "shadedApi"(project(":common:api"))
+}

common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/AddonClassLoader.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Terra.
+ *
+ * Terra is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Terra is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dfsek.terra.addon;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+
+public class AddonClassLoader extends URLClassLoader {
+    static {
+        ClassLoader.registerAsParallelCapable();
+    }
+    
+    public AddonClassLoader(URL[] urls, ClassLoader parent) {
+        super(urls, parent);
+    }
+}

common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java

@@ -0,0 +1,99 @@
+/*
+ * This file is part of Terra.
+ *
+ * Terra is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Terra is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dfsek.terra.addon;
+
+import ca.solostudios.strata.Versions;
+import ca.solostudios.strata.version.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+
+import com.dfsek.terra.addon.exception.AddonLoadException;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
+
+
+public class BootstrapAddonLoader implements BootstrapBaseAddon<BootstrapBaseAddon<?>> {
+    private static final Logger logger = LoggerFactory.getLogger(BootstrapAddonLoader.class);
+    private static final Version VERSION = Versions.getVersion(1, 0, 0);
+    
+    private final Platform platform;
+    
+    public BootstrapAddonLoader(Platform platform) { this.platform = platform; }
+    
+    @Override
+    public Iterable<BootstrapBaseAddon<?>> loadAddons(Path addonsFolder, ClassLoader parent) {
+        Path bootstrapAddons = addonsFolder.resolve("bootstrap");
+        logger.info("Loading bootstrap addons from {}", bootstrapAddons);
+        try {
+            return Files.walk(bootstrapAddons, 1)
+                        .filter(path -> path.toFile().isFile() && path.toString().endsWith(".jar"))
+                        .map(path -> {
+                            try {
+                                logger.info("Loading bootstrap addon from JAR {}", path);
+                                JarFile jar = new JarFile(path.toFile());
+                                String entry = jar.getManifest().getMainAttributes().getValue("Bootstrap-Addon-Entry-Point");
+                    
+                                if(entry == null) {
+                                    throw new AddonLoadException("No Bootstrap-Addon-Entry-Point attribute defined in addon manifest.");
+                                }
+                    
+                                AddonClassLoader loader = new AddonClassLoader(new URL[]{ path.toUri().toURL() }, parent);
+                    
+                                try {
+                                    Object in = loader.loadClass(entry).getConstructor().newInstance();
+                                    if(!(in instanceof BootstrapBaseAddon)) {
+                                        throw new AddonLoadException(in.getClass() + " does not extend " + BootstrapBaseAddon.class);
+                                    }
+                                    logger.info("Loaded bootstrap addon {}", ((BootstrapBaseAddon<?>) in).getID());
+                                    return (BootstrapBaseAddon<?>) in;
+                                } catch(InvocationTargetException e) {
+                                    throw new AddonLoadException("Exception occurred while instantiating addon: ", e);
+                                } catch(NoSuchMethodException | IllegalAccessException | InstantiationException e) {
+                                    throw new AddonLoadException("No valid default constructor found in entry point " + entry);
+                                } catch(ClassNotFoundException e) {
+                                    throw new AddonLoadException("Entry point " + entry + " not found in JAR.");
+                                }
+                    
+                            } catch(IOException e) {
+                                throw new UncheckedIOException(e);
+                            }
+                        }).collect(Collectors.toList());
+        } catch(IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+    
+    @Override
+    public String getID() {
+        return "BOOTSTRAP";
+    }
+    
+    @Override
+    public Version getVersion() {
+        return VERSION;
+    }
+}

common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/exception/AddonLoadException.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Terra.
+ *
+ * Terra is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Terra is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dfsek.terra.addon.exception;
+
+import java.io.Serial;
+
+
+public class AddonLoadException extends RuntimeException {
+    @Serial
+    private static final long serialVersionUID = -4949084729296580176L;
+    
+    public AddonLoadException(String message) {
+        super(message);
+    }
+    
+    public AddonLoadException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/exception/CircularDependencyException.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Terra.
+ *
+ * Terra is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Terra is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dfsek.terra.addon.exception;
+
+import java.io.Serial;
+
+
+public class CircularDependencyException extends AddonLoadException {
+    @Serial
+    private static final long serialVersionUID = 7398510879124125121L;
+    
+    public CircularDependencyException(String message) {
+        super(message);
+    }
+    
+    public CircularDependencyException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/exception/DependencyMissingException.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Terra.
+ *
+ * Terra is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Terra is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dfsek.terra.addon.exception;
+
+import java.io.Serial;
+
+
+public class DependencyMissingException extends AddonLoadException {
+    @Serial
+    private static final long serialVersionUID = -8419489102208521583L;
+    
+    public DependencyMissingException(String message) {
+        super(message);
+    }
+    
+    public DependencyMissingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}