Replace the ArgumentTypes class with MinecraftArgumentType enum for safety

Author: Revxrsal

bukkit/src/main/java/revxrsal/commands/bukkit/BukkitBrigadier.java

@@ -27,7 +27,7 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import org.jetbrains.annotations.NotNull;
 import revxrsal.commands.bukkit.brigadier.ArgumentTypeResolver;
-import revxrsal.commands.bukkit.brigadier.ArgumentTypes;
+import revxrsal.commands.bukkit.brigadier.MinecraftArgumentType;
 import revxrsal.commands.command.CommandActor;
 import revxrsal.commands.command.CommandParameter;
 
@@ -51,21 +51,19 @@ public interface BukkitBrigadier {
      *
      * @param type         Type to register for
      * @param argumentType The argument type to register
-     * @see ArgumentTypes
+     * @see revxrsal.commands.bukkit.brigadier.MinecraftArgumentType
      */
     void bind(@NotNull Class<?> type, @NotNull ArgumentType<?> argumentType);
 
     /**
-     * Registers a native Minecraft argument type for the given class.
-     * This will include subclasses as well.
-     * <p>
-     * See <a href="https://wiki.vg/Command_Data#Parsers">Command Data</a>
+     * Registers an argument type for the given class. This will
+     * include subclasses as well.
      *
-     * @param type            Type to register for
-     * @param argumentTypeKey The key of the argument type
-     * @see ArgumentTypes
+     * @param type         Type to register for
+     * @param argumentType The argument type to register
+     * @see revxrsal.commands.bukkit.brigadier.MinecraftArgumentType
      */
-    void bind(@NotNull Class<?> type, @NotNull String argumentTypeKey);
+    void bind(@NotNull Class<?> type, @NotNull MinecraftArgumentType argumentType);
 
     /**
      * Returns the argument type corresponding to the given parameter. If

bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/ArgumentTypes.java

@@ -26,7 +26,6 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.tree.LiteralCommandNode;
-import org.bukkit.NamespacedKey;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -74,10 +73,10 @@ public CommodoreBukkitBrigadier(BukkitCommandHandler handler) {
         argumentTypes.add(type, parameter -> argumentType);
     }
 
-    @Override public void bind(@NotNull Class<?> type, @NotNull String argumentTypeKey) {
+    @Override public void bind(@NotNull Class<?> type, @NotNull MinecraftArgumentType argumentType) {
         notNull(type, "type");
-        notNull(argumentTypeKey, "argument type key");
-        argumentTypes.add(type, parameter -> ArgumentTypes.getByKey(NamespacedKey.minecraft(argumentTypeKey)));
+        notNull(argumentType, "argument type");
+        argumentType.getIfPresent().ifPresent(c -> argumentTypes.add(type, parameter -> c));
     }
 
     public @NotNull ArgumentType<?> getArgumentType(@NotNull CommandParameter parameter) {

bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java

@@ -44,7 +44,7 @@ private static Throwable checkSupported() {
         try {
             Class.forName("com.mojang.brigadier.CommandDispatcher");
             Commodore.ensureSetup();
-            ArgumentTypes.ensureSetup();
+            MinecraftArgumentType.ensureSetup();
             return null;
         } catch (Throwable e) {
             return e;

bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreProvider.java

@@ -25,23 +25,19 @@
 
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.BoolArgumentType;
-import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import revxrsal.commands.annotation.Range;
 import revxrsal.commands.bukkit.core.BukkitHandler;
 import revxrsal.commands.util.Primitives;
 
-import java.lang.reflect.Constructor;
-
 import static com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg;
 import static com.mojang.brigadier.arguments.FloatArgumentType.floatArg;
 import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
 import static com.mojang.brigadier.arguments.LongArgumentType.longArg;
 import static com.mojang.brigadier.arguments.StringArgumentType.greedyString;
 import static com.mojang.brigadier.arguments.StringArgumentType.string;
-import static revxrsal.commands.bukkit.brigadier.ArgumentTypes.getClassByKey;
 import static revxrsal.commands.util.Preconditions.coerceAtLeast;
 import static revxrsal.commands.util.Preconditions.coerceAtMost;
 
@@ -105,16 +101,6 @@ private DefaultArgTypeResolvers() {}
     };
 
     private static ArgumentType<?> entity(boolean single, boolean playerOnly) {
-        return newEntityType(NamespacedKey.minecraft("entity"), single, playerOnly);
-    }
-
-    private static ArgumentType<?> newEntityType(NamespacedKey key, Object... args) {
-        try {
-            final Constructor<? extends ArgumentType<?>> constructor = getClassByKey(key).getDeclaredConstructor(boolean.class, boolean.class);
-            constructor.setAccessible(true);
-            return constructor.newInstance(args);
-        } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
-        }
+        return MinecraftArgumentType.ENTITY.create(single, playerOnly);
     }
 }