Merge pull request #9 from ZorTik/development

getDistinctCommands()

Author: ZorTik

src/main/java/me/zort/commandlib/CommandEntry.java

@@ -23,7 +23,7 @@
 import static me.zort.commandlib.util.CommandUtil.parseCommandName;
 
 public class CommandEntry {
-    private final CommandLib lib;
+    private final CommandLib<?> lib;
     @Getter
     private final CommandEntryMeta meta;
     @Getter
@@ -48,7 +48,7 @@ public static class ParsingProcessData {
         private final Set<Class<? extends CommandArgumentRule>> passedRules;
     }
 
-    public CommandEntry(CommandLib lib, Object mappingObject, Method method) {
+    public CommandEntry(CommandLib<?> lib, Object mappingObject, Method method) {
         this.lib = lib;
         this.mappingObject = mappingObject;
         this.method = method;
@@ -210,11 +210,6 @@ public boolean matchesForSuggestion(String commandName, String[] args) {
                 continue;
             }
 
-            /*boolean last = i == args.length - 1;
-            if((last && !syntaxArgs[i].startsWith(arg)) || (!last && !syntaxArgs[i].equals(arg))) {
-                return false;
-            }*/
-
             if (!syntaxArgs[i].startsWith(arg)) {
                 return false;
             }

src/main/java/me/zort/commandlib/CommandEntryMeta.java

@@ -5,7 +5,7 @@
 
 @NoArgsConstructor
 @Data
-public class CommandEntryMeta {
+public class CommandEntryMeta implements CommandMeta {
 
     private String name;
     private String description = "";

src/main/java/me/zort/commandlib/CommandLib.java

@@ -21,7 +21,7 @@
 import java.util.stream.Collectors;
 
 // S = CommandSender
-public abstract class CommandLib<S> {
+public abstract class CommandLib<S> implements Iterable<CommandMeta> {
     public static final Gson GSON = new Gson();
 
     private final Iterable<Object> mappingObjects;
@@ -93,6 +93,10 @@ public void unregisterAll() {
         commands.clear();
     }
 
+    public Map<String, CommandMeta> getDistinctCommands() {
+        return commands.stream().collect(Collectors.toMap(CommandEntry::getName, CommandEntry::getMeta));
+    }
+
     // Command name with slash.
     protected void invoke(Object sender, String commandName, String[] args) {
         if(!commandName.startsWith("/")) {
@@ -200,4 +204,8 @@ private void loadMappingObject(Object obj) {
         }
     }
 
+    @Override
+    public Iterator<CommandMeta> iterator() {
+        return getDistinctCommands().values().iterator();
+    }
 }

src/main/java/me/zort/commandlib/CommandMeta.java

@@ -0,0 +1,9 @@
+package me.zort.commandlib;
+
+public interface CommandMeta {
+
+    String getName();
+    String getDescription();
+    String getUsage();
+
+}