From 172006f2f6dcb987b6f266f6667bf38974116568 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Wed, 17 Nov 2021 16:22:14 -0700
Subject: [PATCH] initialize manifest addons

---
 common/addons/manifest-addon-loader                          | 2 +-
 .../src/main/java/com/dfsek/terra/api/inject/Injector.java   | 5 +++++
 .../java/com/dfsek/terra/api/inject/impl}/InjectorImpl.java  | 2 +-
 .../src/main/java/com/dfsek/terra/AbstractPlatform.java      | 2 +-
 .../java/com/dfsek/terra/commands/TerraCommandManager.java   | 2 +-
 .../java/com/dfsek/terra/registry/master/AddonRegistry.java  | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 rename common/{implementation/src/main/java/com/dfsek/terra/inject => api/inject/src/main/java/com/dfsek/terra/api/inject/impl}/InjectorImpl.java (97%)

diff --git a/common/addons/manifest-addon-loader b/common/addons/manifest-addon-loader
index 40d1b58c4..31456bf9c 160000
--- a/common/addons/manifest-addon-loader
+++ b/common/addons/manifest-addon-loader
@@ -1 +1 @@
-Subproject commit 40d1b58c41b518bc6f0052c54037630925ad7ae7
+Subproject commit 31456bf9cd9bffdefbac263a4e62b74c8b58ea21
diff --git a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java
index 78ea1b23d..ee915ad1a 100644
--- a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java
+++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java
@@ -2,6 +2,7 @@ package com.dfsek.terra.api.inject;
 
 import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.inject.exception.InjectionException;
+import com.dfsek.terra.api.inject.impl.InjectorImpl;
 
 
 /**
@@ -37,4 +38,8 @@ public interface Injector<T> {
      *                            </ul>
      */
     void inject(Object object) throws InjectionException;
+    
+    static <T1> Injector<T1> get(T1 value) {
+        return new InjectorImpl<>(value);
+    }
 }
diff --git a/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java
similarity index 97%
rename from common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java
rename to common/api/inject/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java
index f6ccb6e07..7c511f7e6 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java
+++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.inject;
+package com.dfsek.terra.api.inject.impl;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
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 33fcf30a5..2ce1433ae 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
@@ -41,7 +41,7 @@ import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.event.EventManagerImpl;
-import com.dfsek.terra.inject.InjectorImpl;
+import com.dfsek.terra.api.inject.impl.InjectorImpl;
 import com.dfsek.terra.profiler.ProfilerImpl;
 import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.LockedRegistryImpl;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java
index e12518106..5b294d1fc 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java
@@ -36,7 +36,7 @@ import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.inject.exception.InjectionException;
 import com.dfsek.terra.api.util.reflection.ReflectionUtil;
-import com.dfsek.terra.inject.InjectorImpl;
+import com.dfsek.terra.api.inject.impl.InjectorImpl;
 
 
 public class TerraCommandManager implements CommandManager {
diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
index ed593712e..f5ea6ab06 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
@@ -15,7 +15,7 @@ import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.inject.exception.InjectionException;
 import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
-import com.dfsek.terra.inject.InjectorImpl;
+import com.dfsek.terra.api.inject.impl.InjectorImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;