WIP ArgumentGroup nodes, renamed NodeMaker#addNodes

src/main/java/net/minestom/server/command/CommandManager.java

@@ -482,6 +482,7 @@ public final class CommandManager {
                         }
                     }
 
+                    // Always add to the main node list
                     nodes.add(node);
                 }
 

src/main/java/net/minestom/server/command/builder/NodeMaker.java

@@ -13,7 +13,7 @@ public class NodeMaker {
         return currentNodes;
     }
 
-    public void setCurrentNodes(@NotNull DeclareCommandsPacket.Node[] nodes) {
+    public void addNodes(@NotNull DeclareCommandsPacket.Node[] nodes) {
         this.currentNodes = nodes;
     }
 

src/main/java/net/minestom/server/command/builder/arguments/ArgumentBoolean.java

@@ -34,7 +34,7 @@ public class ArgumentBoolean extends Argument<Boolean> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "brigadier:bool";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
 }

src/main/java/net/minestom/server/command/builder/arguments/ArgumentDynamicStringArray.java

@@ -48,7 +48,7 @@ public class ArgumentDynamicStringArray extends Argument<String[]> {
         };
         argumentNode.suggestionsType = "minecraft:ask_server";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
     /**

src/main/java/net/minestom/server/command/builder/arguments/ArgumentDynamicWord.java

@@ -57,7 +57,7 @@ public class ArgumentDynamicWord extends Argument<String> {
         };
         argumentNode.suggestionsType = suggestionType.getIdentifier();
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
     /**

src/main/java/net/minestom/server/command/builder/arguments/ArgumentGroup.java

@@ -39,6 +39,9 @@ public class ArgumentGroup extends Argument<Arguments> {
 
     @Override
     public void processNodes(@NotNull NodeMaker nodeMaker, boolean executable) {
-        // TODO
+        for (int i = 0; i < group.length; i++) {
+            final boolean isLast = i == group.length - 1;
+            group[i].processNodes(nodeMaker, executable && isLast);
+        }
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/ArgumentLiteral.java

@@ -29,6 +29,6 @@ public class ArgumentLiteral extends Argument<String> {
                 executable, false, false);
         literalNode.name = getId();
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{literalNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{literalNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/ArgumentString.java

@@ -34,7 +34,7 @@ public class ArgumentString extends Argument<String> {
             packetWriter.writeVarInt(1); // Quotable phrase
         };
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
     @NotNull

src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java

@@ -33,6 +33,6 @@ public class ArgumentStringArray extends Argument<String[]> {
             packetWriter.writeVarInt(2); // Greedy phrase
         };
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java

@@ -99,12 +99,12 @@ public class ArgumentWord extends Argument<String> {
                 nodes[i] = argumentNode;
 
             }
-            nodeMaker.setCurrentNodes(nodes);
+            nodeMaker.addNodes(nodes);
         } else {
             // Can be any word, add only one argument node
             DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
             wordConsumer.accept(argumentNode);
-            nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+            nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
         }
     }
 

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java

@@ -35,6 +35,6 @@ public class ArgumentColor extends Argument<ChatColor> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:color";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentEntity.java

@@ -82,7 +82,7 @@ public class ArgumentEntity extends Argument<EntityFinder> {
             packetWriter.writeByte(mask);
         };
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
     @NotNull

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentFloatRange.java

@@ -60,6 +60,6 @@ public class ArgumentFloatRange extends ArgumentRange<FloatRange> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:float_range";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentIntRange.java

@@ -65,6 +65,6 @@ public class ArgumentIntRange extends ArgumentRange<IntRange> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:int_range";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentItemStack.java

@@ -69,6 +69,6 @@ public class ArgumentItemStack extends Argument<ItemStack> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:item_stack";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtCompoundTag.java

@@ -45,6 +45,6 @@ public class ArgumentNbtCompoundTag extends Argument<NBTCompound> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:nbt_compound_tag";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtTag.java

@@ -41,6 +41,6 @@ public class ArgumentNbtTag extends Argument<NBT> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:nbt_tag";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java

@@ -64,6 +64,6 @@ public class ArgumentTime extends Argument<UpdateOption> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:time";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentBlockState.java

@@ -22,6 +22,6 @@ public class ArgumentBlockState extends ArgumentRegistry<Block> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:block_state";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEnchantment.java

@@ -25,6 +25,6 @@ public class ArgumentEnchantment extends ArgumentRegistry<Enchantment> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:item_enchantment";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEntityType.java

@@ -25,6 +25,6 @@ public class ArgumentEntityType extends ArgumentRegistry<EntityType> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:entity_summon";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentParticle.java

@@ -25,6 +25,6 @@ public class ArgumentParticle extends ArgumentRegistry<Particle> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:particle";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentPotionEffect.java

@@ -25,6 +25,6 @@ public class ArgumentPotionEffect extends ArgumentRegistry<PotionEffect> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:mob_effect";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java

@@ -55,7 +55,7 @@ public class ArgumentDouble extends ArgumentNumber<Double> {
                 packetWriter.writeDouble(this.getMax());
         };
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
 }

src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java

@@ -55,7 +55,7 @@ public class ArgumentFloat extends ArgumentNumber<Float> {
                 packetWriter.writeFloat(this.getMax());
         };
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
 }

src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java

@@ -46,7 +46,7 @@ public class ArgumentInteger extends ArgumentNumber<Integer> {
                 packetWriter.writeInt(this.getMax());
         };
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
 }

src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentLong.java

@@ -48,7 +48,7 @@ public class ArgumentLong extends ArgumentNumber<Long> {
                 packetWriter.writeInt(this.getMax().intValue());
         };
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
 }

src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeBlockPosition.java

@@ -86,6 +86,6 @@ public class ArgumentRelativeBlockPosition extends ArgumentRelative<RelativeBloc
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:block_pos";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }

src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec2.java

@@ -74,7 +74,7 @@ public class ArgumentRelativeVec2 extends ArgumentRelative<RelativeVec> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:vec2";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
 }

src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec3.java

@@ -81,6 +81,6 @@ public class ArgumentRelativeVec3 extends ArgumentRelative<RelativeVec> {
         DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false, false);
         argumentNode.parser = "minecraft:vec3";
 
-        nodeMaker.setCurrentNodes(new DeclareCommandsPacket.Node[]{argumentNode});
+        nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 }