* NEW: First draft for the new Commands API.

Author: prokopyl

src/main/java/fr/zcraft/zlib/components/commands2/Command.java

@@ -0,0 +1,12 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+public class Command<T extends CommandNode> {
+
+    
+}

src/main/java/fr/zcraft/zlib/components/commands2/CommandData.java

@@ -0,0 +1,70 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+import java.util.Collection;
+import org.apache.commons.lang.NotImplementedException;
+import org.bukkit.command.CommandSender;
+
+public class CommandData<T extends CommandNode> implements CommandNode<T>
+{
+
+    @Override
+    public T getParent()
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public Collection getChildren()
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String getName()
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String[] getAliases()
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String getShortDescription()
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public String getUsage()
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public void run(CommandSender sender, String... arguments) throws CommandException
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public Collection complete(CommandSender sender, String... arguments) throws CommandException
+    {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public boolean canExecute(CommandSender sender)
+    {
+        throw new NotImplementedException();
+    }
+
+}

src/main/java/fr/zcraft/zlib/components/commands2/CommandException.java

@@ -0,0 +1,12 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+public class CommandException extends Exception
+{
+
+}

src/main/java/fr/zcraft/zlib/components/commands2/CommandGroup.java

@@ -0,0 +1,11 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+public class CommandGroup extends CommandData {
+
+}

src/main/java/fr/zcraft/zlib/components/commands2/CommandNode.java

@@ -0,0 +1,26 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+import java.util.Collection;
+import org.bukkit.command.CommandSender;
+
+public interface CommandNode<T extends CommandNode>
+{
+    public T getParent();
+    public Collection<CommandNode> getChildren();
+    
+    public String getName();
+    public String[] getAliases();
+    public String getShortDescription();
+    public String getUsage();
+    
+    public void run(CommandSender sender, String... arguments) throws CommandException;
+    public Collection complete(CommandSender sender, String... arguments) throws CommandException;
+    public boolean canExecute(CommandSender sender);
+    
+}

src/main/java/fr/zcraft/zlib/components/commands2/CommandTreeBuilder.java

@@ -0,0 +1,45 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+public class CommandTreeBuilder
+{
+    public CommandTreeBuilder command(Class<? extends Command> command)
+    {
+        return this;
+    }
+    
+    public CommandTreeBuilder command(String name, Class<? extends Command> command)
+    {
+        return this;
+    }
+    
+    public CommandTreeBuilder commands(Class<? extends Command>... command)
+    {
+        return this;
+    }
+    
+    public CommandTreeBuilder subCommand(String name, String... aliases)
+    {
+        return this;
+    }
+    
+    public CommandTreeBuilder subCommand(String name, CommandGroup group, String... aliases)
+    {
+        return this;
+    }
+    
+    public CommandTreeBuilder endGroup()
+    {
+        return this;
+    }
+    
+    public CommandTreeBuilder end()
+    {
+        return this;
+    }
+}

src/main/java/fr/zcraft/zlib/components/commands2/Commands.java

@@ -0,0 +1,15 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+public abstract class Commands 
+{
+    static public CommandTreeBuilder register()
+    {
+        return new CommandTreeBuilder();
+    }
+}

src/test/java/fr/zcraft/zlib/components/commands2/CommandsTest.java

@@ -0,0 +1,26 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+import org.junit.Test;
+
+public class CommandsTest 
+{
+    @Test
+    public void simpleTest()
+    {
+        Commands.register()
+            .subCommand("belovedblocks", "bb")
+                .subCommand("give", "g")
+                    .subCommand("tool", new CustomGroup(1), "t")
+                        .command(MyCommand.class)
+                    .endGroup()
+                    .subCommand("block", new CustomGroup(2), "b")
+                        .command(MyCommand.class)
+                    .end();
+    }
+}

src/test/java/fr/zcraft/zlib/components/commands2/CustomGroup.java

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+public class CustomGroup extends CommandGroup
+{
+    private final int veryImportantNumber;
+    
+    public CustomGroup(int veryImportantNumber)
+    {
+        this.veryImportantNumber = veryImportantNumber;
+    }
+
+    public int getVeryImportantNumber()
+    {
+        return veryImportantNumber;
+    }
+    
+}

src/test/java/fr/zcraft/zlib/components/commands2/MyCommand.java

@@ -0,0 +1,12 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package fr.zcraft.zlib.components.commands2;
+
+public class MyCommand extends Command
+{
+
+}

src/test/resources/help/belovedblocks.fr_FR.txt

@@ -0,0 +1 @@
+ 

src/test/resources/help/belovedblocks.txt

@@ -0,0 +1 @@
+ 

src/test/resources/help/belovedblocks/give.fr_FR.txt

@@ -0,0 +1 @@
+ 

src/test/resources/help/belovedblocks/give.txt

@@ -0,0 +1 @@
+ 

src/test/resources/help/belovedblocks/give/block.fr_FR.txt

@@ -0,0 +1 @@
+ 

src/test/resources/help/belovedblocks/give/block.txt

@@ -0,0 +1 @@
+ 

src/test/resources/help/belovedblocks/give/tool.fr_FR.txt

@@ -0,0 +1 @@
+ 

src/test/resources/help/belovedblocks/give/tool.txt

@@ -0,0 +1 @@
+