From 174b23c8ef2d26c7bd3bcf87de3d9143c120f884 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Wed, 17 Nov 2021 15:29:28 -0700
Subject: [PATCH] add logging

---
 .../java/com/dfsek/terra/AbstractPlatform.java    | 15 +++++++++------
 .../dfsek/terra/addon/BootstrapAddonLoader.java   |  2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
index 6823b2291..33fcf30a5 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
@@ -200,12 +200,15 @@ public abstract class AbstractPlatform implements Platform {
         platformInjector.addExplicitTarget(Platform.class);
         
         bootstrapAddonLoader.loadAddons(addonsFolder, getClass().getClassLoader())
-                            .forEach(bootstrap -> bootstrap.loadAddons(addonsFolder, getClass().getClassLoader())
-                                                           .forEach(addon -> {
-                                                               platformInjector.inject(addon);
-                                                               addon.initialize();
-                                                               addonRegistry.register(addon.getID(), addon);
-                                                           }));
+                            .forEach(bootstrap -> {
+                                platformInjector.inject(bootstrap);
+                                bootstrap.loadAddons(addonsFolder, getClass().getClassLoader())
+                                         .forEach(addon -> {
+                                             platformInjector.inject(addon);
+                                             addon.initialize();
+                                             addonRegistry.register(addon.getID(), addon);
+                                         });
+                            });
         
         eventManager
                 .getHandler(FunctionalEventHandler.class)
diff --git a/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java b/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java
index 5c9b10986..5ec665b01 100644
--- a/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java
+++ b/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java
@@ -3,6 +3,7 @@ package com.dfsek.terra.addon;
 import com.dfsek.terra.addon.exception.AddonLoadException;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
+import com.dfsek.terra.api.inject.Injector;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -43,6 +44,7 @@ public class BootstrapAddonLoader implements BootstrapBaseAddon<BootstrapBaseAdd
                                     if(!(in instanceof BootstrapBaseAddon)) {
                                         throw new AddonLoadException(in.getClass() + " does not extend " + BootstrapBaseAddon.class);
                                     }
+                                    platform.logger().info("Loaded bootstrap addon " + ((BootstrapBaseAddon<?>) in).getID());
                                     return (BootstrapBaseAddon<?>) in;
                                 } catch(InvocationTargetException e) {
                                     throw new AddonLoadException("Exception occurred while instantiating addon: ", e);