RegisterCommand annotation

ablax · Jan 26, 2020 · baf570f · baf570f
1 parent ffe0241
commit baf570f
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,11 +68,6 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.atteo.classindex</groupId>
-            <artifactId>classindex</artifactId>
-            <version>3.4</version>
-        </dependency>
     </dependencies>
 
 

diff --git a/src/main/java/me/ablax/decode/AdvancedPlugin.java b/src/main/java/me/ablax/decode/AdvancedPlugin.java
@@ -2,6 +2,22 @@
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-public class AdvancedPlugin extends JavaPlugin  {
+public class AdvancedPlugin extends JavaPlugin {
+
+    private ApiManagerImpl apiManager;
+
+    @Override
+    public void onEnable() {
+        apiManager = ApiManagerImpl.getInstance();
+    }
+
+    public void registerPlugin(JavaPlugin javaPlugin) {
+        apiManager.register(javaPlugin);
+    }
+
+    public Object getComponent(Class<?> getObject) {
+        return apiManager.getComponent(getObject);
+    }
+
 
 }
diff --git a/src/main/java/me/ablax/decode/ApiManagerImpl.java b/src/main/java/me/ablax/decode/ApiManagerImpl.java
@@ -3,11 +3,11 @@
 import com.google.common.reflect.ClassPath;
 import me.ablax.decode.annotation.AutoInject;
 import me.ablax.decode.annotation.Component;
+import me.ablax.decode.annotation.RegisterCommand;
 import me.ablax.decode.annotation.RegisterListener;
-import org.atteo.classindex.ClassIndex;
 import org.bukkit.Bukkit;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;
@@ -32,10 +32,13 @@ public static ApiManagerImpl getInstance() {
         return instance;
     }
 
-    private void registerAllComponents(List<? extends Class<?>> claz) {
+    private void registerAllComponents(List<? extends Class<?>> allClasses) {
         try {
-            for (Class<?> aClass : ClassIndex.getAnnotated(Component.class)) {
-                registerComponent(aClass);
+            for (Class<?> aClass : allClasses) {
+                if (aClass.isAnnotationPresent(Component.class)) {
+                    registerComponent(aClass);
+                }
+
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -112,23 +115,50 @@ private void populateField(Object klass, Field field, Class<?> type) throws NoSu
         field.set(klass, components.get(type.getCanonicalName()));
     }
 
-    private void registerAllListeners(Object claz, List<? extends Class<?>> classesList) {
+    private void registerAllListeners(JavaPlugin javaPlugin, List<? extends Class<?>> classesList) {
+        try {
+            for (Class<?> aClass : classesList) {
+                if (aClass.isAnnotationPresent(RegisterListener.class)) {
+                    registerListener(javaPlugin, aClass);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void registerAllCommands(JavaPlugin javaPlugin, List<? extends Class<?>> classesList) {
         try {
-            for (Class<?> aClass : ClassIndex.getAnnotated(RegisterListener.class)) {
-                registerListener(claz, aClass);
+            for (Class<?> aClass : classesList) {
+                if (aClass.isAnnotationPresent(RegisterCommand.class)) {
+                    registerCommand(javaPlugin, aClass);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    private void registerListener(Object claz, Class<?> aClass) {
+    private void registerListener(JavaPlugin claz, Class<?> aClass) {
+        if (components.containsKey(aClass.getCanonicalName())) {
+            Bukkit.getPluginManager().registerEvents((Listener) components.get(aClass.getCanonicalName()), claz);
+        } else {
+            registerComponent(aClass);
+            if (components.containsKey(aClass.getCanonicalName())) {
+                Bukkit.getPluginManager().registerEvents((Listener) components.get(aClass.getCanonicalName()), claz);
+            }
+        }
+    }
+
+    private void registerCommand(JavaPlugin plugin, Class<?> aClass) {
         if (components.containsKey(aClass.getCanonicalName())) {
-            Bukkit.getPluginManager().registerEvents((Listener) components.get(aClass.getCanonicalName()), (Plugin) claz);
-        } else if (aClass.isAnnotationPresent(RegisterListener.class)) {
+            final RegisterCommand annotation = aClass.getAnnotation(RegisterCommand.class);
+            plugin.getCommand(annotation.commandName()).setExecutor((CommandExecutor) components.get(aClass.getCanonicalName()));
+        } else {
             registerComponent(aClass);
             if (components.containsKey(aClass.getCanonicalName())) {
-                Bukkit.getPluginManager().registerEvents((Listener) components.get(aClass.getCanonicalName()), (Plugin) claz);
+                final RegisterCommand annotation = aClass.getAnnotation(RegisterCommand.class);
+                plugin.getCommand(annotation.commandName()).setExecutor((CommandExecutor) components.get(aClass.getCanonicalName()));
             }
         }
     }
@@ -152,7 +182,7 @@ private List<? extends Class<?>> getClassesList(Class<? extends JavaPlugin> java
         return classesList;
     }
 
-    public void register(JavaPlugin javaPlugin) {
+    void register(JavaPlugin javaPlugin) {
         final Class<? extends JavaPlugin> javaPluginClass = javaPlugin.getClass();
         components.put(javaPluginClass.getCanonicalName(), javaPlugin);
         populateInjectors(javaPlugin);
@@ -161,16 +191,11 @@ public void register(JavaPlugin javaPlugin) {
         if (classesList != null) {
             registerAllComponents(classesList);
             registerAllListeners(javaPlugin, classesList);
+            registerAllCommands(javaPlugin, classesList);
         }
-
-        components.values().forEach(o -> {
-            if (o.getClass().isAnnotationPresent(RegisterListener.class)) {
-                registerListener(javaPlugin, o.getClass());
-            }
-        });
     }
 
-    public Object getComponent(Class<?> getObject) {
+    Object getComponent(Class<?> getObject) {
         if (!components.containsKey(getObject.getCanonicalName())
                 && getObject.isAnnotationPresent(Component.class)) {
             registerComponent(getObject);

diff --git a/src/main/java/me/ablax/decode/annotation/AutoInject.java b/src/main/java/me/ablax/decode/annotation/AutoInject.java
@@ -1,14 +1,11 @@
 package me.ablax.decode.annotation;
 
 
-import org.atteo.classindex.IndexAnnotated;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@IndexAnnotated
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface AutoInject {

diff --git a/src/main/java/me/ablax/decode/annotation/Component.java b/src/main/java/me/ablax/decode/annotation/Component.java
@@ -1,13 +1,10 @@
 package me.ablax.decode.annotation;
 
-import org.atteo.classindex.IndexAnnotated;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@IndexAnnotated
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface Component {

diff --git a/src/main/java/me/ablax/decode/annotation/RegisterCommand.java b/src/main/java/me/ablax/decode/annotation/RegisterCommand.java
@@ -0,0 +1,15 @@
+package me.ablax.decode.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Component
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface RegisterCommand {
+
+    String commandName();
+
+}
diff --git a/src/main/java/me/ablax/decode/annotation/RegisterListener.java b/src/main/java/me/ablax/decode/annotation/RegisterListener.java
@@ -1,13 +1,11 @@
 package me.ablax.decode.annotation;
 
-import org.atteo.classindex.IndexAnnotated;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@IndexAnnotated
 @Component
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)