move DI stuff to new subproject

2026-04-09 17:26:07 +00:00 · 2021-09-24 12:31:08 -07:00
parent 1dc2f2c23c
commit 09b4da7974
42 changed files with 47 additions and 47 deletions
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java
@@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;


@Command(
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;


@WorldCommand
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.config.lang.LangUtil;

--- a/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java
@@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.config.lang.LangUtil;


--- a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java
@@ -33,7 +33,7 @@ import com.dfsek.terra.api.command.exception.SwitchFormatException;
 import com.dfsek.terra.api.command.tab.TabCompleter;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
-import com.dfsek.terra.api.injection.exception.InjectionException;
+import com.dfsek.terra.api.inject.exception.InjectionException;
 import com.dfsek.terra.api.util.reflection.ReflectionUtil;
 import com.dfsek.terra.inject.InjectorImpl;

--- a/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java
@@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.config.lang.LangUtil;


--- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;


@Command
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;


@Command
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;


@Command
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.inject.annotations.Inject;


@Command
--- a/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java
@@ -5,9 +5,9 @@ import java.lang.reflect.Modifier;
 import java.util.HashSet;
 import java.util.Set;

-import com.dfsek.terra.api.injection.Injector;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.injection.exception.InjectionException;
+import com.dfsek.terra.api.inject.Injector;
+import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.inject.exception.InjectionException;
 import com.dfsek.terra.api.util.reflection.ReflectionUtil;


--- 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
@@ -13,7 +13,7 @@ import com.dfsek.terra.addon.PreLoadAddon;
 import com.dfsek.terra.addon.exception.AddonLoadException;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.injection.exception.InjectionException;
+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.registry.OpenRegistryImpl;