From b0afadf0933a62499ddb7f901dc70a9bb5330133 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Sun, 25 Apr 2021 10:42:05 +0200
Subject: [PATCH] Override Argument#toString for all subclasses

---
 .../command/builder/arguments/ArgumentBoolean.java |  4 ++++
 .../command/builder/arguments/ArgumentCommand.java |  5 +++++
 .../command/builder/arguments/ArgumentLiteral.java |  5 +++++
 .../command/builder/arguments/ArgumentString.java  |  5 +++++
 .../builder/arguments/ArgumentStringArray.java     |  5 +++++
 .../command/builder/arguments/ArgumentWord.java    |  5 +++++
 .../builder/arguments/minecraft/ArgumentColor.java |  5 +++++
 .../arguments/minecraft/ArgumentComponent.java     |  5 +++++
 .../arguments/minecraft/ArgumentEntity.java        | 14 ++++++++++++++
 .../arguments/minecraft/ArgumentFloatRange.java    |  5 +++++
 .../arguments/minecraft/ArgumentIntRange.java      |  5 +++++
 .../arguments/minecraft/ArgumentItemStack.java     |  5 +++++
 .../minecraft/ArgumentNbtCompoundTag.java          |  5 +++++
 .../arguments/minecraft/ArgumentNbtTag.java        |  5 +++++
 .../minecraft/ArgumentResourceLocation.java        |  5 +++++
 .../builder/arguments/minecraft/ArgumentTime.java  |  5 +++++
 .../builder/arguments/minecraft/ArgumentUUID.java  |  5 +++++
 .../minecraft/registry/ArgumentBlockState.java     |  5 +++++
 .../minecraft/registry/ArgumentEnchantment.java    |  5 +++++
 .../minecraft/registry/ArgumentEntityType.java     |  5 +++++
 .../minecraft/registry/ArgumentParticle.java       |  5 +++++
 .../minecraft/registry/ArgumentPotionEffect.java   |  5 +++++
 .../builder/arguments/number/ArgumentDouble.java   |  4 ++++
 .../builder/arguments/number/ArgumentFloat.java    |  4 ++++
 .../builder/arguments/number/ArgumentInteger.java  |  4 ++++
 .../relative/ArgumentRelativeBlockPosition.java    |  5 +++++
 .../arguments/relative/ArgumentRelativeVec2.java   |  4 ++++
 .../arguments/relative/ArgumentRelativeVec3.java   |  5 +++++
 28 files changed, 144 insertions(+)

diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentBoolean.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentBoolean.java
index e227352fe..9a76b99ae 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentBoolean.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentBoolean.java
@@ -37,4 +37,8 @@ public class ArgumentBoolean extends Argument<Boolean> {
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
+    @Override
+    public String toString() {
+        return String.format("Boolean<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentCommand.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentCommand.java
index c2d90c5ae..d6179499a 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentCommand.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentCommand.java
@@ -74,4 +74,9 @@ public class ArgumentCommand extends Argument<CommandResult> {
         this.shortcut = shortcut;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return String.format("Command<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentLiteral.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentLiteral.java
index cc65aab21..558e38509 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentLiteral.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentLiteral.java
@@ -31,4 +31,9 @@ public class ArgumentLiteral extends Argument<String> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{literalNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("Literal<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentString.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentString.java
index 337a33544..0bca51aa8 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentString.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentString.java
@@ -77,4 +77,9 @@ public class ArgumentString extends Argument<String> {
 
         return StringEscapeUtils.unescapeJava(input);
     }
+
+    @Override
+    public String toString() {
+        return String.format("String<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java
index c6fb090bb..e56781dbc 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java
@@ -36,4 +36,9 @@ public class ArgumentStringArray extends Argument<String[]> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("StringArray<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
index 7426a41ce..5f2deb5b3 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
@@ -116,4 +116,9 @@ public class ArgumentWord extends Argument<String> {
     public String[] getRestrictions() {
         return restrictions;
     }
+
+    @Override
+    public String toString() {
+        return String.format("Word<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java
index 6e6f804c2..dfe6e805f 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java
@@ -47,4 +47,9 @@ public class ArgumentColor extends Argument<Style> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("Color<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentComponent.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentComponent.java
index 8d3e8af1f..5d2817be4 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentComponent.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentComponent.java
@@ -35,4 +35,9 @@ public class ArgumentComponent extends Argument<Component> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("Component<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentEntity.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentEntity.java
index 3e4b47946..11e51b08b 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentEntity.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentEntity.java
@@ -269,6 +269,20 @@ public class ArgumentEntity extends Argument<EntityFinder> {
         return onlyPlayers;
     }
 
+    @Override
+    public String toString() {
+        if (onlySingleEntity) {
+            if (onlyPlayers) {
+                return String.format("Player<%s>", getId());
+            }
+            return String.format("Entity<%s>", getId());
+        }
+        if (onlyPlayers) {
+            return String.format("Players<%s>", getId());
+        }
+        return String.format("Entities<%s>", getId());
+    }
+
     private static EntityFinder.TargetSelector toTargetSelector(@NotNull String selectorVariable) {
         if (selectorVariable.equals("@p"))
             return EntityFinder.TargetSelector.NEAREST_PLAYER;
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentFloatRange.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentFloatRange.java
index 686c5d63c..bc25f5fcf 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentFloatRange.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentFloatRange.java
@@ -62,4 +62,9 @@ public class ArgumentFloatRange extends ArgumentRange<FloatRange> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("FloatRange<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentIntRange.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentIntRange.java
index 2928ef90b..f61faa7d9 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentIntRange.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentIntRange.java
@@ -67,4 +67,9 @@ public class ArgumentIntRange extends ArgumentRange<IntRange> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("IntRange<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentItemStack.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentItemStack.java
index e038998a0..96b3b9559 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentItemStack.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentItemStack.java
@@ -67,4 +67,9 @@ public class ArgumentItemStack extends Argument<ItemStack> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("ItemStack<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtCompoundTag.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtCompoundTag.java
index 59793856f..ba9861192 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtCompoundTag.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtCompoundTag.java
@@ -47,4 +47,9 @@ public class ArgumentNbtCompoundTag extends Argument<NBTCompound> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("NbtCompound<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtTag.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtTag.java
index 2ca6fc5d0..e9996ce4c 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtTag.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentNbtTag.java
@@ -43,4 +43,9 @@ public class ArgumentNbtTag extends Argument<NBT> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("NBT<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentResourceLocation.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentResourceLocation.java
index 7bf8b410a..44d41ecc7 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentResourceLocation.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentResourceLocation.java
@@ -31,4 +31,9 @@ public class ArgumentResourceLocation extends Argument<String> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("ResourceLocation<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java
index 9d4173f16..37c80edc6 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java
@@ -66,4 +66,9 @@ public class ArgumentTime extends Argument<UpdateOption> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("Time<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentUUID.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentUUID.java
index 9521f9245..ea5d63e4b 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentUUID.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentUUID.java
@@ -33,4 +33,9 @@ public class ArgumentUUID extends Argument<UUID> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("UUID<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentBlockState.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentBlockState.java
index ea2a725f4..194cda8dd 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentBlockState.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentBlockState.java
@@ -24,4 +24,9 @@ public class ArgumentBlockState extends ArgumentRegistry<Block> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("BlockState<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEnchantment.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEnchantment.java
index 62285169b..5d4743cca 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEnchantment.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEnchantment.java
@@ -27,4 +27,9 @@ public class ArgumentEnchantment extends ArgumentRegistry<Enchantment> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("Enchantment<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEntityType.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEntityType.java
index 2ab777d60..4613842ab 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEntityType.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentEntityType.java
@@ -29,4 +29,9 @@ public class ArgumentEntityType extends ArgumentRegistry<EntityType> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("EntityType<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentParticle.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentParticle.java
index 91c7e42ff..2c8c16bd5 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentParticle.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentParticle.java
@@ -27,4 +27,9 @@ public class ArgumentParticle extends ArgumentRegistry<Particle> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("Particle<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentPotionEffect.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentPotionEffect.java
index 29e92db1b..c3f2a3490 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentPotionEffect.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/registry/ArgumentPotionEffect.java
@@ -27,4 +27,9 @@ public class ArgumentPotionEffect extends ArgumentRegistry<PotionEffect> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("Potion<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java
index 255dbb8da..6dbcd545d 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java
@@ -57,4 +57,8 @@ public class ArgumentDouble extends ArgumentNumber<Double> {
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
+    @Override
+    public String toString() {
+        return String.format("Double<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java
index b74c12b57..ab685e371 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java
@@ -57,4 +57,8 @@ public class ArgumentFloat extends ArgumentNumber<Float> {
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
+    @Override
+    public String toString() {
+        return String.format("Float<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java
index a75eb6db1..6350e9b35 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java
@@ -48,4 +48,8 @@ public class ArgumentInteger extends ArgumentNumber<Integer> {
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
+    @Override
+    public String toString() {
+        return String.format("Integer<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeBlockPosition.java b/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeBlockPosition.java
index d6497ff4d..bb0a7f4d1 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeBlockPosition.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeBlockPosition.java
@@ -88,4 +88,9 @@ public class ArgumentRelativeBlockPosition extends ArgumentRelative<RelativeBloc
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("RelativeBlockPosition<%s>", getId());
+    }
 }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec2.java b/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec2.java
index e0652e69a..9aa894b37 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec2.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec2.java
@@ -77,4 +77,8 @@ public class ArgumentRelativeVec2 extends ArgumentRelative<RelativeVec> {
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
 
+    @Override
+    public String toString() {
+        return String.format("RelativeVec2<%s>", getId());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec3.java b/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec3.java
index fd2893506..6f632b6a7 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec3.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/relative/ArgumentRelativeVec3.java
@@ -83,4 +83,9 @@ public class ArgumentRelativeVec3 extends ArgumentRelative<RelativeVec> {
 
         nodeMaker.addNodes(new DeclareCommandsPacket.Node[]{argumentNode});
     }
+
+    @Override
+    public String toString() {
+        return String.format("RelativeVec3<%s>", getId());
+    }
 }