Update Tree Builders

Author: dualspiral

src/main/java/org/spongepowered/api/command/registrar/CommandRegistrar.java

@@ -145,6 +145,6 @@ public interface CommandRegistrar extends CatalogType {
      *
      * @param builder The builder to supply command information to
      */
-    void completeCommandTree(CommandTreeBuilder.Empty builder);
+    void completeCommandTree(CommandTreeBuilder.Basic builder);
 
 }

src/main/java/org/spongepowered/api/command/registrar/tree/ClientCompletionKeys.java

@@ -49,30 +49,30 @@ public class ClientCompletionKeys {
      * Completions will attempt to return arguments that represent
      * {@link BlockState}s
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> BLOCK_STATE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> BLOCK_STATE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "BLOCK_STATE");
 
     /**
      * Completions will attempt to return arguments that represent
      * {@link BlockState}s - // TODO: Predicate
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> BLOCK_PREDICATE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> BLOCK_PREDICATE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "BLOCK_PREDICATE");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> BOOLEAN =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> BOOLEAN =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "BOOLEAN");
 
     /**
      * Completions will attempt to return arguments that represent
      * {@link Color}s
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> COLOR =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> COLOR =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "COLOR");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> DIMENSION =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> DIMENSION =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "DIMENSION");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> DOUBLE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> DOUBLE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "DOUBLE");
 
     /**
@@ -82,130 +82,130 @@ public class ClientCompletionKeys {
     public static ClientCompletionKey<CommandTreeBuilder.EntitySelection> ENTITY =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "ENTITY");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> ENTITY_ANCHOR =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> ENTITY_ANCHOR =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "ENTITY_ANCHOR");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> ENTITY_SUMMON =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> ENTITY_SUMMON =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "ENTITY_SUMMON");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> FLOAT =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> FLOAT =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "FLOAT");
 
     public static ClientCompletionKey<CommandTreeBuilder.Range<Float>> FLOAT_RANGE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "FLOAT_RANGE");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> FUNCTION =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> FUNCTION =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "FUNCTION");
 
     /**
      * Completions will attempt to return arguments that represent
      * {@link GameProfile}s
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> GAME_PROFILE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> GAME_PROFILE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "GAME_PROFILE");
 
     public static ClientCompletionKey<CommandTreeBuilder.Range<Integer>> INT_RANGE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "INT_RANGE");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> INTEGER =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> INTEGER =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "INTEGER");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> ITEM_ENCHANTMENT =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> ITEM_ENCHANTMENT =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "ITEM_ENCHANTMENT");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> ITEM_SLOT =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> ITEM_SLOT =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "ITEM_SLOT");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> LONG =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> LONG =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "LONG");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> MESSAGE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> MESSAGE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "MESSAGE");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> MOB_EFFECT =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> MOB_EFFECT =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "MOB_EFFECT");
 
     // TODO -> dataview?
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> NBT_COMPOUND =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> NBT_COMPOUND =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "NBT_TAG");
 
     // TODO -> datapath?
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> NBT_PATH =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> NBT_PATH =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "NBT_PATH");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> NBT_TAG =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> NBT_TAG =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "NBT_TAG");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> OBJECTIVE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> OBJECTIVE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "OBJECTIVE");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> OBJECTIVE_CRITERIA =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> OBJECTIVE_CRITERIA =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "OBJECTIVE_CRITERIA");
 
     // TODO -> check
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> OPERATION =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> OPERATION =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "OPERATION");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> PARTICLE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> PARTICLE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "PARTICLE");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> RESOURCE_LOCATION =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> RESOURCE_LOCATION =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "RESOURCE_LOCATION");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> ROTATION =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> ROTATION =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "ROTATION");
 
     public static ClientCompletionKey<CommandTreeBuilder.Amount> SCORE_HOLDER =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "SCORE_HOLDER");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> SCOREBOARD_SLOT =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> SCOREBOARD_SLOT =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "SCOREBOARD_SLOT");
 
     public static ClientCompletionKey<CommandTreeBuilder.StringParser> STRING =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "STRING");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> SWIZZLE =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> SWIZZLE =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "SWIZZLE");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> TEAM =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> TEAM =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "TEAM");
 
     /**
      * Completions will attempt to return arguments that represent
      * {@link Text}s
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> TEXT =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> TEXT =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "TEXT");
 
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> TIME =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> TIME =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "TIME");
 
     /**
      * Completions will attempt to return arguments that represent a
      * real-space position (that is, two-dimensional decimal co-ordinates).
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> VECTOR_2D =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> VECTOR_2D =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "VECTOR_2D");
 
     /**
      * Completions will attempt to return arguments that represent a
      * block position (that is, two-dimensional integer co-ordinates).
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> VECTOR_2I =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> VECTOR_2I =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "VECTOR_2I");
 
     /**
      * Completions will attempt to return arguments that represent a
      * real-space position (that is, three-dimensional decimal co-ordinates).
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> VECTOR_3D =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> VECTOR_3D =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "VECTOR_3D");
 
     /**
      * Completions will attempt to return arguments that represent a
      * block position (that is, three-dimensional integer co-ordinates).
      */
-    public static ClientCompletionKey<CommandTreeBuilder.Empty> VECTOR_3I =
+    public static ClientCompletionKey<CommandTreeBuilder.Basic> VECTOR_3I =
             DummyObjectProvider.createExtendedFor(ClientCompletionKey.class, "VECTOR_3I");
 
     // SORTFIELDS: OFF

src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeBuilder.java

@@ -44,7 +44,7 @@ public interface CommandTreeBuilder<T extends CommandTreeBuilder<T>> {
      *                  {@link CommandTreeBuilder} for the newly created child.
      * @return This, for chaining.
      */
-    T child(String key, Consumer<Empty> childNode);
+    T child(String key, Consumer<Basic> childNode);
 
     /**
      * Creates a child of this node with the given key that accepts a
@@ -62,14 +62,13 @@ public interface CommandTreeBuilder<T extends CommandTreeBuilder<T>> {
     <S extends CommandTreeBuilder<S>> T child(String key, ClientCompletionKey<S> completionKey, Consumer<S> childNode);
 
     /**
-     * Declares that the given {@code key} should be considered as if the
-     * string specified in {@code to} has been executed.
+     * Declares that this element will redirect processing to the given node
+     * <strong>after</strong> this node has been processed.
      *
-     * @param key The key
-     * @param to The string to redirect to
+     * @param to The node to redirect to
      * @return This, for chaining
      */
-    T redirect(String key, String to);
+    T redirect(String to);
 
     /**
      * Declares that the node this {@link CommandTreeBuilder} represents is
@@ -119,7 +118,7 @@ public interface CommandTreeBuilder<T extends CommandTreeBuilder<T>> {
     /**
      * A {@link CommandTreeBuilder} with no known properties to set.
      */
-    interface Empty extends CommandTreeBuilder<Empty> { }
+    interface Basic extends CommandTreeBuilder<Basic> { }
 
     /**
      * A {@link CommandTreeBuilder} that allows for a min-max range to be set.