From 8142224f6757bbe9aae927df9a32562e473c1ca3 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Mon, 3 May 2021 18:01:00 +0200
Subject: [PATCH] Add SWCommand.Register.Registeres

---
 .../src/de/steamwar/command/SWCommand.java        | 15 ++++++++++++---
 .../src/de/steamwar/command/SWCommandUtils.java   |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index ae31780..60bda46 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -153,8 +153,8 @@ public abstract class SWCommand {
     }
 
     private <T extends Annotation> void add(Class<T> annotation, Method method, IntPredicate parameterTester, boolean firstParameter, Class<?> returnType, BiConsumer<T, Parameter[]> consumer) {
-        T anno = SWCommandUtils.getAnnotation(method, annotation);
-        if (anno == null) {
+        T[] anno = SWCommandUtils.getAnnotation(method, annotation);
+        if (anno == null || anno.length == 0) {
             return;
         }
 
@@ -171,7 +171,9 @@ public abstract class SWCommand {
             Bukkit.getLogger().log(Level.WARNING, "The method '" + method.toString() + "' is lacking the desired return type '" + returnType.getTypeName() + "'");
             return;
         }
-        consumer.accept(anno, parameters);
+        for (T a : anno) {
+            consumer.accept(a, parameters);
+        }
     }
 
     private <T extends Annotation> void addMapper(Class<T> annotation, Method method, IntPredicate parameterTester, boolean firstParameter, Class<?> returnType, BiConsumer<T, TypeMapper<?>> consumer) {
@@ -200,10 +202,17 @@ public abstract class SWCommand {
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD})
+    @Repeatable(Register.Registeres.class)
     protected @interface Register {
         String[] value() default {};
 
         boolean help() default false;
+
+        @Retention(RetentionPolicy.RUNTIME)
+        @Target({ElementType.METHOD})
+        @interface Registeres {
+            Register[] value();
+        }
     }
 
     @Retention(RetentionPolicy.RUNTIME)
diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java b/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java
index 0d09c7f..e6e281c 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java
@@ -188,8 +188,8 @@ public class SWCommandUtils {
         };
     }
 
-    static <T extends Annotation> T getAnnotation(Method method, Class<T> annotation) {
+    static <T extends Annotation> T[] getAnnotation(Method method, Class<T> annotation) {
         if (method.getAnnotations().length != 1) return null;
-        return method.getAnnotation(annotation);
+        return method.getDeclaredAnnotationsByType(annotation);
     }
 }