Put simpleArgumentNode into Argument

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

@@ -534,24 +534,6 @@ public final class CommandManager {
         return result;
     }
 
-    /**
-     * Builds an argument node.
-     *
-     * @param argument   the argument
-     * @param executable true if this will be the last argument, false otherwise
-     * @return the created {@link DeclareCommandsPacket.Node}
-     */
-    @NotNull
-    public DeclareCommandsPacket.Node simpleArgumentNode(@NotNull Argument<?> argument,
-                                                          boolean executable, boolean suggestion) {
-        DeclareCommandsPacket.Node argumentNode = new DeclareCommandsPacket.Node();
-
-        argumentNode.flags = getFlag(NodeType.ARGUMENT, executable, false, suggestion);
-        argumentNode.name = argument.getId();
-
-        return argumentNode;
-    }
-
     public byte getFlag(@NotNull NodeType type, boolean executable, boolean redirect, boolean suggestionType) {
         byte result = (byte) type.mask;
 

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

@@ -84,6 +84,24 @@ public abstract class Argument<T> {
     @NotNull
     public abstract DeclareCommandsPacket.Node[] toNodes(boolean executable);
 
+    /**
+     * Builds an argument node.
+     *
+     * @param argument   the argument
+     * @param executable true if this will be the last argument, false otherwise
+     * @return the created {@link DeclareCommandsPacket.Node}
+     */
+    @NotNull
+    protected static DeclareCommandsPacket.Node simpleArgumentNode(@NotNull Argument<?> argument,
+                                                         boolean executable, boolean suggestion) {
+        DeclareCommandsPacket.Node argumentNode = new DeclareCommandsPacket.Node();
+
+        argumentNode.flags = COMMAND_MANAGER.getFlag(CommandManager.NodeType.ARGUMENT, executable, false, suggestion);
+        argumentNode.name = argument.getId();
+
+        return argumentNode;
+    }
+
     /**
      * Gets the ID of the argument, showed in-game above the chat bar
      * and used to retrieve the data when the command is parsed in {@link net.minestom.server.command.builder.Arguments}.

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

@@ -31,7 +31,7 @@ public class ArgumentBoolean extends Argument<Boolean> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
 
         argumentNode.parser = "brigadier:bool";
 

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

@@ -40,7 +40,7 @@ public class ArgumentDynamicStringArray extends Argument<String[]> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, true);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, true);
 
         argumentNode.parser = "brigadier:string";
         argumentNode.properties = packetWriter -> {

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

@@ -47,7 +47,7 @@ public class ArgumentDynamicWord extends Argument<String> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, true);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, true);
 
         final SuggestionType suggestionType = this.getSuggestionType();
 

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

@@ -27,7 +27,7 @@ public class ArgumentString extends Argument<String> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
 
         argumentNode.parser = "brigadier:string";
         argumentNode.properties = packetWriter -> {

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

@@ -27,7 +27,7 @@ public class ArgumentStringArray extends Argument<String[]> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
 
         argumentNode.parser = "brigadier:string";
         argumentNode.properties = packetWriter -> {

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

@@ -32,7 +32,7 @@ public class ArgumentColor extends Argument<ChatColor> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:color";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -57,7 +57,7 @@ public class ArgumentFloatRange extends ArgumentRange<FloatRange> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:float_range";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -62,7 +62,7 @@ public class ArgumentIntRange extends ArgumentRange<IntRange> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:int_range";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -66,7 +66,7 @@ public class ArgumentItemStack extends Argument<ItemStack> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:item_stack";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -42,7 +42,7 @@ public class ArgumentNbtCompoundTag extends Argument<NBTCompound> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:nbt_compound_tag";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -38,7 +38,7 @@ public class ArgumentNbtTag extends Argument<NBT> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:nbt_tag";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -61,7 +61,7 @@ public class ArgumentTime extends Argument<UpdateOption> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:time";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -19,7 +19,7 @@ public class ArgumentBlockState extends ArgumentRegistry<Block> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:block_state";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -22,7 +22,7 @@ public class ArgumentEnchantment extends ArgumentRegistry<Enchantment> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:item_enchantment";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -22,7 +22,7 @@ public class ArgumentEntityType extends ArgumentRegistry<EntityType> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:entity_summon";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -22,7 +22,7 @@ public class ArgumentParticle extends ArgumentRegistry<Particle> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:particle";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -22,7 +22,7 @@ public class ArgumentPotionEffect extends ArgumentRegistry<PotionEffect> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:mob_effect";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -45,7 +45,7 @@ public class ArgumentDouble extends ArgumentNumber<Double> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
 
         argumentNode.parser = "brigadier:double";
         argumentNode.properties = packetWriter -> {

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

@@ -45,7 +45,7 @@ public class ArgumentFloat extends ArgumentNumber<Float> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
 
         argumentNode.parser = "brigadier:float";
         argumentNode.properties = packetWriter -> {

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

@@ -36,7 +36,7 @@ public class ArgumentInteger extends ArgumentNumber<Integer> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
 
         argumentNode.parser = "brigadier:integer";
         argumentNode.properties = packetWriter -> {

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

@@ -36,7 +36,7 @@ public class ArgumentLong extends ArgumentNumber<Long> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
 
         // TODO maybe use ArgumentLiteral/ArgumentWord and impose long restriction server side?
 

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

@@ -83,7 +83,7 @@ public class ArgumentRelativeBlockPosition extends ArgumentRelative<RelativeBloc
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:block_pos";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -71,7 +71,7 @@ public class ArgumentRelativeVec2 extends ArgumentRelative<RelativeVec> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:vec2";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }

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

@@ -78,7 +78,7 @@ public class ArgumentRelativeVec3 extends ArgumentRelative<RelativeVec> {
     @NotNull
     @Override
     public DeclareCommandsPacket.Node[] toNodes(boolean executable) {
-        DeclareCommandsPacket.Node argumentNode = COMMAND_MANAGER.simpleArgumentNode(this, executable, false);
+        DeclareCommandsPacket.Node argumentNode = simpleArgumentNode(this, executable, false);
         argumentNode.parser = "minecraft:vec3";
         return new DeclareCommandsPacket.Node[]{argumentNode};
     }