a

33 files changed, 188 insertions, 260 deletions

diff --git a/azalea-brigadier/src/ambiguity_consumer.rs b/azalea-brigadier/src/ambiguity_consumer.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/ambiguity_consumer.rs
+++ b/azalea-brigadier/src/ambiguity_consumer.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/arguments/argument_type.rs b/azalea-brigadier/src/arguments/argument_type.rs
index 890cdea0..3d1b1168 100644
--- a/azalea-brigadier/src/arguments/argument_type.rs
+++ b/azalea-brigadier/src/arguments/argument_type.rs
@@ -7,19 +7,6 @@ use crate::{
 };
 use dyn_clonable::*;
 
-#[clonable]
-// This should be applied to an Enum
-pub trait Types: Clone {
-    fn bool(value: bool) -> Self
-    where
-        Self: Sized;
-
-    /// Get the less specific ArgumentType from this enum
-    fn inner<T>(&self) -> Box<dyn ArgumentType<T>>
-    where
-        Self: Sized;
-}
-
 /*
 #[derive(Types)]
 enum BrigadierTypes {
@@ -45,10 +32,8 @@ impl Types for BrigadierTypes {
 */
 
 #[clonable]
-pub trait ArgumentType<T: ?Sized>: Clone
-where
-    T: Types,
-{
+pub trait ArgumentType: Clone {
+    type Into;
     // T parse(StringReader reader) throws CommandSyntaxException;
 
     // default <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> context, final SuggestionsBuilder builder) {
@@ -59,17 +44,16 @@ where
     //     return Collections.emptyList();
     // }
 
-    fn parse(&self, reader: &mut StringReader) -> Result<Box<T>, CommandSyntaxException>;
+    fn parse(&self, reader: &mut StringReader) -> Result<Self::Into, CommandSyntaxException>;
 
     fn list_suggestions<S>(
         &self,
-        context: &CommandContext<S, T>,
+        context: &CommandContext<S>,
         builder: &mut SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException>
     where
         Self: Sized,
-        S: Sized,
-        T: Sized;
+        S: Sized;
 
     fn get_examples(&self) -> Vec<String>;
 }
diff --git a/azalea-brigadier/src/arguments/bool_argument_type.rs b/azalea-brigadier/src/arguments/bool_argument_type.rs
index b04488c1..c06f40c1 100644
--- a/azalea-brigadier/src/arguments/bool_argument_type.rs
+++ b/azalea-brigadier/src/arguments/bool_argument_type.rs
@@ -5,27 +5,25 @@ use crate::{
     suggestion::{suggestions::Suggestions, suggestions_builder::SuggestionsBuilder},
 };
 
-use super::argument_type::{ArgumentType, Types};
+use super::argument_type::ArgumentType;
 
 #[derive(Clone)]
 pub struct BoolArgumentType {}
 
-impl<T> ArgumentType<T> for BoolArgumentType
-where
-    T: Types,
-{
-    fn parse(&self, reader: &mut StringReader) -> Result<T, CommandSyntaxException> {
-        Ok(T::bool(reader.read_boolean()?))
+impl ArgumentType for BoolArgumentType {
+    type Into = bool;
+
+    fn parse(&self, reader: &mut StringReader) -> Result<Self::Into, CommandSyntaxException> {
+        Ok(reader.read_boolean()?)
     }
 
     fn list_suggestions<S>(
         &self,
-        context: &CommandContext<S, T>,
+        context: &CommandContext<S>,
         builder: &mut SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException>
     where
         S: Sized,
-        T: Sized,
     {
         // if ("true".startsWith(builder.getRemainingLowerCase())) {
         //     builder.suggest("true");
@@ -55,7 +53,7 @@ impl BoolArgumentType {
         Self {}
     }
 
-    fn get_bool<S, T>(context: CommandContext<S, T>, name: String) {
+    fn get_bool<S>(context: CommandContext<S>, name: String) {
         context.get_argument::<bool>(name)
     }
 }
diff --git a/azalea-brigadier/src/arguments/double_argument_type.rs b/azalea-brigadier/src/arguments/double_argument_type.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/arguments/double_argument_type.rs
+++ b/azalea-brigadier/src/arguments/double_argument_type.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/arguments/float_argument_type.rs b/azalea-brigadier/src/arguments/float_argument_type.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/arguments/float_argument_type.rs
+++ b/azalea-brigadier/src/arguments/float_argument_type.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/arguments/integer_argument_type.rs b/azalea-brigadier/src/arguments/integer_argument_type.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/arguments/integer_argument_type.rs
+++ b/azalea-brigadier/src/arguments/integer_argument_type.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/arguments/long_argument_type.rs b/azalea-brigadier/src/arguments/long_argument_type.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/arguments/long_argument_type.rs
+++ b/azalea-brigadier/src/arguments/long_argument_type.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/arguments/string_argument_type.rs b/azalea-brigadier/src/arguments/string_argument_type.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/arguments/string_argument_type.rs
+++ b/azalea-brigadier/src/arguments/string_argument_type.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/builder/argument_builder.rs b/azalea-brigadier/src/builder/argument_builder.rs
index 0360b05a..6355456a 100644
--- a/azalea-brigadier/src/builder/argument_builder.rs
+++ b/azalea-brigadier/src/builder/argument_builder.rs
@@ -1,33 +1,32 @@
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
+    arguments::argument_type::ArgumentType,
     command::Command,
     redirect_modifier::RedirectModifier,
     single_redirect_modifier::SingleRedirectModifier,
     tree::{command_node::CommandNode, root_command_node::RootCommandNode},
 };
 
-pub struct BaseArgumentBuilder<'a, S, T>
+pub struct BaseArgumentBuilder<'a, S>
 where
     S: Sized,
-    T: Sized + ArgumentType<dyn Types>,
 {
-    arguments: RootCommandNode<'a, S, T>,
-    command: Option<&'a dyn Command<S, T>>,
+    arguments: RootCommandNode<'a, S>,
+    command: Option<&'a dyn Command<S>>,
     requirement: &'a dyn Fn(&S) -> bool,
-    target: Option<&'a dyn CommandNode<S, T>>,
-    modifier: Option<&'a dyn RedirectModifier<S, T>>,
+    target: Option<&'a dyn CommandNode<S>>,
+    modifier: Option<&'a dyn RedirectModifier<S>>,
     forks: bool,
 }
 
-pub trait ArgumentBuilder<S, T> {
-    fn build(self) -> dyn CommandNode<S, T>;
-}
-
-impl<S, T> BaseArgumentBuilder<'_, S, T>
+pub trait ArgumentBuilder<S, T>
 where
-    T: ArgumentType<dyn Types>,
+    T: ArgumentBuilder<S, T>,
 {
-    pub fn then(&mut self, command: dyn CommandNode<S, T>) -> Result<&mut T, String> {
+    fn build(self) -> dyn CommandNode<S>;
+}
+
+impl<S> BaseArgumentBuilder<'_, S> {
+    pub fn then(&mut self, command: dyn CommandNode<S>) -> Result<&mut Self, String> {
         if self.target.is_some() {
             return Err("Cannot add children to a redirected node".to_string());
         }
@@ -35,20 +34,20 @@ where
         Ok(self)
     }
 
-    pub fn arguments(&self) -> &Vec<&dyn CommandNode<S, T>> {
+    pub fn arguments(&self) -> &Vec<&dyn CommandNode<S>> {
         &self.arguments.get_children()
     }
 
-    pub fn executes(&mut self, command: dyn Command<S, T>) -> &mut T {
+    pub fn executes(&mut self, command: dyn Command<S>) -> &mut Self {
         self.command = command;
         self
     }
 
-    pub fn command(&self) -> dyn Command<S, T> {
+    pub fn command(&self) -> dyn Command<S> {
         self.command
     }
 
-    pub fn requires(&mut self, requirement: &dyn Fn(&S) -> bool) -> &mut T {
+    pub fn requires(&mut self, requirement: &dyn Fn(&S) -> bool) -> &mut Self {
         self.requirement = requirement;
         self
     }
@@ -57,33 +56,33 @@ where
         self.requirement
     }
 
-    pub fn redirect(&mut self, target: &dyn CommandNode<S, T>) -> &mut T {
+    pub fn redirect(&mut self, target: &dyn CommandNode<S>) -> &mut Self {
         self.forward(target, None, false)
     }
 
     pub fn redirect_modifier(
         &mut self,
-        target: &dyn CommandNode<S, T>,
-        modifier: &dyn SingleRedirectModifier<S, T>,
-    ) -> &mut T {
+        target: &dyn CommandNode<S>,
+        modifier: &dyn SingleRedirectModifier<S>,
+    ) -> &mut Self {
         // forward(target, modifier == null ? null : o -> Collections.singleton(modifier.apply(o)), false);
         self.forward(target, modifier.map(|m| |o| vec![m.apply(o)]), false)
     }
 
     pub fn fork(
         &mut self,
-        target: &dyn CommandNode<S, T>,
-        modifier: &dyn RedirectModifier<S, T>,
-    ) -> &mut T {
+        target: &dyn CommandNode<S>,
+        modifier: &dyn RedirectModifier<S>,
+    ) -> &mut Self {
         self.forward(target, Some(modifier), true)
     }
 
     pub fn forward(
         &mut self,
-        target: &dyn CommandNode<S, T>,
-        modifier: Option<&dyn RedirectModifier<S, T>>,
+        target: &dyn CommandNode<S>,
+        modifier: Option<&dyn RedirectModifier<S>>,
         fork: bool,
-    ) -> Result<&mut T, String> {
+    ) -> Result<&mut Self, String> {
         if !self.arguments.get_children().is_empty() {
             return Err("Cannot forward a node with children".to_string());
         }
@@ -93,11 +92,11 @@ where
         Ok(self)
     }
 
-    pub fn get_redirect(&self) -> Option<&dyn CommandNode<S, T>> {
+    pub fn get_redirect(&self) -> Option<&dyn CommandNode<S>> {
         self.target.as_ref()
     }
 
-    pub fn get_redirect_modifier(&self) -> Option<&dyn RedirectModifier<S, T>> {
+    pub fn get_redirect_modifier(&self) -> Option<&dyn RedirectModifier<S>> {
         self.modifier.as_ref()
     }
 
diff --git a/azalea-brigadier/src/builder/literal_argument_builder.rs b/azalea-brigadier/src/builder/literal_argument_builder.rs
index a4cb3f84..8039dff0 100644
--- a/azalea-brigadier/src/builder/literal_argument_builder.rs
+++ b/azalea-brigadier/src/builder/literal_argument_builder.rs
@@ -1,23 +1,16 @@
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
-    tree::literal_command_node::LiteralCommandNode,
+    arguments::argument_type::ArgumentType, tree::literal_command_node::LiteralCommandNode,
 };
 
 use super::argument_builder::BaseArgumentBuilder;
 
-pub struct LiteralArgumentBuilder<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+pub struct LiteralArgumentBuilder<'a, S> {
     literal: String,
 
-    pub base: BaseArgumentBuilder<'a, S, T>,
+    pub base: BaseArgumentBuilder<'a, S>,
 }
 
-impl<'a, S, T> LiteralArgumentBuilder<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+impl<'a, S> LiteralArgumentBuilder<'a, S> {
     pub fn new(literal: String) -> Self {
         Self {
             literal,
@@ -29,7 +22,7 @@ where
         Self::new(name)
     }
 
-    pub fn build(self) -> LiteralCommandNode<'a, S, T> {
+    pub fn build(self) -> LiteralCommandNode<'a, S> {
         let result = LiteralCommandNode::new(self.literal, self.base);
 
         for argument in self.base.arguments {
diff --git a/azalea-brigadier/src/builder/required_argument_builder.rs b/azalea-brigadier/src/builder/required_argument_builder.rs
index b5f99828..29af7f6f 100644
--- a/azalea-brigadier/src/builder/required_argument_builder.rs
+++ b/azalea-brigadier/src/builder/required_argument_builder.rs
@@ -1,30 +1,25 @@
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
+    arguments::argument_type::ArgumentType,
     suggestion::suggestion_provider::SuggestionProvider,
     tree::{argument_command_node::ArgumentCommandNode, command_node::BaseCommandNode},
 };
+use std::any::Any;
 
 use super::argument_builder::BaseArgumentBuilder;
 
-pub struct RequiredArgumentBuilder<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+pub struct RequiredArgumentBuilder<'a, S> {
     // private final String name;
     // private final ArgumentType<T> type;
     // private SuggestionProvider<S> suggestionsProvider = null;
     name: String,
-    type_: &'a T,
-    suggestions_provider: Option<&'a dyn SuggestionProvider<S, T>>,
+    type_: Box<dyn ArgumentType<Into = dyn Any>>,
+    suggestions_provider: Option<&'a dyn SuggestionProvider<S>>,
 
-    pub base: BaseArgumentBuilder<'a, S, T>,
+    pub base: BaseArgumentBuilder<'a, S>,
 }
 
-impl<'a, S, T> RequiredArgumentBuilder<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
-    pub fn new(name: String, type_: T) -> Self {
+impl<'a, S> RequiredArgumentBuilder<'a, S> {
+    pub fn new(name: String, type_: dyn ArgumentType<Into = dyn Any>) -> Self {
         Self {
             name,
             type_: &type_,
@@ -33,20 +28,20 @@ where
         }
     }
 
-    pub fn argument(name: String, type_: T) -> Self {
+    pub fn argument(name: String, type_: dyn ArgumentType<Into = dyn Any>) -> Self {
         Self::new(name, type_)
     }
 
-    pub fn suggests(mut self, provider: &dyn SuggestionProvider<S, T>) -> Self {
+    pub fn suggests(mut self, provider: &dyn SuggestionProvider<S>) -> Self {
         self.suggestions_provider = Some(provider);
         self
     }
 
-    pub fn suggestions_provider(&self) -> Option<&dyn SuggestionProvider<S, T>> {
+    pub fn suggestions_provider(&self) -> Option<&dyn SuggestionProvider<S>> {
         self.suggestions_provider.as_ref()
     }
 
-    pub fn get_type(&self) -> &T {
+    pub fn get_type(&self) -> &dyn ArgumentType<Into = dyn Any> {
         self.type_
     }
 
@@ -54,14 +49,14 @@ where
         self.name
     }
 
-    // final ArgumentCommandNode<S, T> result = new ArgumentCommandNode<>(getName(), getType(), getCommand(), getRequirement(), getRedirect(), getRedirectModifier(), isFork(), getSuggestionsProvider());
+    // final ArgumentCommandNode<S> result = new ArgumentCommandNode<>(getName(), getType(), getCommand(), getRequirement(), getRedirect(), getRedirectModifier(), isFork(), getSuggestionsProvider());
 
     // for (final CommandNode<S> argument : getArguments()) {
     // 	result.addChild(argument);
     // }
 
     // return result;
-    pub fn build(self) -> ArgumentCommandNode<'a, S, T> {
+    pub fn build(self) -> ArgumentCommandNode<'a, S> {
         let result = ArgumentCommandNode {
             name: self.name,
             type_: &self.type_,
diff --git a/azalea-brigadier/src/command.rs b/azalea-brigadier/src/command.rs
index dcbf3ffd..a529f23c 100644
--- a/azalea-brigadier/src/command.rs
+++ b/azalea-brigadier/src/command.rs
@@ -7,6 +7,6 @@ use dyn_clonable::*;
 pub const SINGLE_SUCCESS: i32 = 1;
 
 #[clonable]
-pub trait Command<S, T>: Clone {
-    fn run(&self, context: &mut CommandContext<S, T>) -> Result<i32, CommandSyntaxException>;
+pub trait Command<S>: Clone {
+    fn run(&self, context: &mut CommandContext<S>) -> Result<i32, CommandSyntaxException>;
 }
diff --git a/azalea-brigadier/src/command_dispatcher.rs b/azalea-brigadier/src/command_dispatcher.rs
index f2fc7528..72a353ad 100644
--- a/azalea-brigadier/src/command_dispatcher.rs
+++ b/azalea-brigadier/src/command_dispatcher.rs
@@ -1,22 +1,13 @@
-use crate::{
-    arguments::argument_type::{ArgumentType, Types},
-    tree::root_command_node::RootCommandNode,
-};
+use crate::{arguments::argument_type::ArgumentType, tree::root_command_node::RootCommandNode};
 
 /// The core command dispatcher, for registering, parsing, and executing commands.
 /// The `S` generic is a custom "source" type, such as a user or originator of a command
 #[derive(Default, Clone)]
-pub struct CommandDispatcher<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
-    root: RootCommandNode<'a, S, T>,
+pub struct CommandDispatcher<'a, S> {
+    root: RootCommandNode<'a, S>,
 }
 
-impl<S, T> CommandDispatcher<'_, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+impl<S> CommandDispatcher<'_, S> {
     /// The string required to separate individual arguments in an input string
     ///
     /// See: [`ARGUMENT_SEPARATOR_CHAR`]
@@ -48,7 +39,7 @@ where
     /// * `root` - the existing [`RootCommandNode`] to use as the basis for this tree
     /// # Returns
     /// A new [`CommandDispatcher`] with the specified root node.
-    fn new(root: RootCommandNode<S, T>) -> Self {
+    fn new(root: RootCommandNode<S>) -> Self {
         Self { root }
     }
 }
diff --git a/azalea-brigadier/src/context/command_context.rs b/azalea-brigadier/src/context/command_context.rs
index 68144a40..4f0b4d49 100644
--- a/azalea-brigadier/src/context/command_context.rs
+++ b/azalea-brigadier/src/context/command_context.rs
@@ -6,22 +6,22 @@ use crate::{
     arguments::argument_type::ArgumentType, command::Command, redirect_modifier::RedirectModifier,
     tree::command_node::CommandNode,
 };
-use std::collections::HashMap;
+use std::{any::Any, collections::HashMap};
 
-pub struct CommandContext<'a, S, T> {
+pub struct CommandContext<'a, S> {
     source: S,
     input: String,
-    command: &'a dyn Command<S, T>,
-    arguments: HashMap<String, ParsedArgument<T>>,
-    root_node: &'a dyn CommandNode<S, T>,
-    nodes: Vec<ParsedCommandNode<S, T>>,
+    command: &'a dyn Command<S>,
+    arguments: HashMap<String, ParsedArgument<Box<dyn Any>>>,
+    root_node: &'a dyn CommandNode<S>,
+    nodes: Vec<ParsedCommandNode<S>>,
     range: StringRange,
-    child: Option<&'a CommandContext<'a, S, T>>,
-    modifier: Option<&'a dyn RedirectModifier<S, T>>,
+    child: Option<&'a CommandContext<'a, S>>,
+    modifier: Option<&'a dyn RedirectModifier<S>>,
     forks: bool,
 }
 
-impl<S, T> CommandContext<'_, S, T>
+impl<S> CommandContext<'_, S>
 where
     S: PartialEq,
 {
@@ -43,11 +43,11 @@ where
         }
     }
 
-    fn child(&self) -> &Option<CommandContext<S, T>> {
+    fn child(&self) -> &Option<CommandContext<S>> {
         &self.child
     }
 
-    fn last_child(&self) -> &CommandContext<S, T> {
+    fn last_child(&self) -> &CommandContext<S> {
         let mut result = self;
         while result.child.is_some() {
             result = result.child.as_ref().unwrap();
@@ -55,7 +55,7 @@ where
         result
     }
 
-    fn command(&self) -> &dyn Command<S, T> {
+    fn command(&self) -> &dyn Command<S> {
         &self.command
     }
 
diff --git a/azalea-brigadier/src/context/command_context_builder.rs b/azalea-brigadier/src/context/command_context_builder.rs
index 639a97ee..95da4064 100644
--- a/azalea-brigadier/src/context/command_context_builder.rs
+++ b/azalea-brigadier/src/context/command_context_builder.rs
@@ -1,10 +1,8 @@
-use std::collections::HashMap;
+use std::{any::Any, collections::HashMap};
 
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
-    command::Command,
-    command_dispatcher::CommandDispatcher,
-    redirect_modifier::RedirectModifier,
+    arguments::argument_type::ArgumentType, command::Command,
+    command_dispatcher::CommandDispatcher, redirect_modifier::RedirectModifier,
     tree::command_node::CommandNode,
 };
 
@@ -27,19 +25,16 @@ use super::{
 //     private boolean forks;
 
 #[derive(Clone)]
-pub struct CommandContextBuilder<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
-    arguments: HashMap<String, ParsedArgument<T>>,
-    root_node: &'a dyn CommandNode<S, T>,
-    nodes: Vec<ParsedCommandNode<S, T>>,
-    dispatcher: CommandDispatcher<'a, S, T>,
+pub struct CommandContextBuilder<'a, S> {
+    arguments: HashMap<String, ParsedArgument<Box<dyn Any>>>,
+    root_node: &'a dyn CommandNode<S>,
+    nodes: Vec<ParsedCommandNode<S>>,
+    dispatcher: CommandDispatcher<'a, S>,
     source: S,
-    command: Box<dyn Command<S, T>>,
-    child: Option<CommandContextBuilder<'a, S, T>>,
+    command: Box<dyn Command<S>>,
+    child: Option<CommandContextBuilder<'a, S>>,
     range: StringRange,
-    modifier: Option<Box<dyn RedirectModifier<S, T>>>,
+    modifier: Option<Box<dyn RedirectModifier<S>>>,
     forks: bool,
 }
 
@@ -50,14 +45,11 @@ where
 // 	this.range = StringRange.at(start);
 // }
 
-impl<S, T> CommandContextBuilder<'_, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+impl<S> CommandContextBuilder<'_, S> {
     pub fn new(
-        dispatcher: CommandDispatcher<S, T>,
+        dispatcher: CommandDispatcher<S>,
         source: S,
-        root_node: dyn CommandNode<S, T>,
+        root_node: dyn CommandNode<S>,
         start: usize,
     ) -> Self {
         Self {
@@ -78,25 +70,25 @@ where
         &self.source
     }
 
-    pub fn root_node(&self) -> &dyn CommandNode<S, T> {
+    pub fn root_node(&self) -> &dyn CommandNode<S> {
         &self.root_node
     }
 
-    pub fn with_argument(mut self, name: String, argument: ParsedArgument<T>) -> Self {
+    pub fn with_argument(mut self, name: String, argument: ParsedArgument<Box<dyn Any>>) -> Self {
         self.arguments.insert(name, argument);
         self
     }
 
-    pub fn arguments(&self) -> &HashMap<String, ParsedArgument<T>> {
+    pub fn arguments(&self) -> &HashMap<String, ParsedArgument<Box<dyn Any>>> {
         &self.arguments
     }
 
-    pub fn with_command(mut self, command: &dyn Command<S, T>) -> Self {
+    pub fn with_command(mut self, command: &dyn Command<S>) -> Self {
         self.command = command;
         self
     }
 
-    pub fn with_node(mut self, node: dyn CommandNode<S, T>, range: StringRange) -> Self {
+    pub fn with_node(mut self, node: dyn CommandNode<S>, range: StringRange) -> Self {
         self.nodes.push(ParsedCommandNode::new(node, range));
         self.range = StringRange::encompassing(&self.range, &range);
         self.modifier = node.redirect_modifier();
@@ -104,16 +96,16 @@ where
         self
     }
 
-    pub fn with_child(mut self, child: CommandContextBuilder<S, T>) -> Self {
+    pub fn with_child(mut self, child: CommandContextBuilder<S>) -> Self {
         self.child = Some(child);
         self
     }
 
-    pub fn child(&self) -> Option<&CommandContextBuilder<S, T>> {
+    pub fn child(&self) -> Option<&CommandContextBuilder<S>> {
         self.child.as_ref()
     }
 
-    pub fn last_child(&self) -> Option<&CommandContextBuilder<S, T>> {
+    pub fn last_child(&self) -> Option<&CommandContextBuilder<S>> {
         let mut result = self;
         while let Some(child) = result.child() {
             result = child;
@@ -121,15 +113,15 @@ where
         Some(result)
     }
 
-    pub fn command(&self) -> &dyn Command<S, T> {
+    pub fn command(&self) -> &dyn Command<S> {
         &*self.command
     }
 
-    pub fn nodes(&self) -> &Vec<ParsedCommandNode<S, T>> {
+    pub fn nodes(&self) -> &Vec<ParsedCommandNode<S>> {
         &self.nodes
     }
 
-    pub fn build(self, input: &str) -> CommandContext<S, T> {
+    pub fn build(self, input: &str) -> CommandContext<S> {
         CommandContext {
             source: self.source,
             input,
@@ -144,7 +136,7 @@ where
         }
     }
 
-    pub fn dispatcher(&self) -> &CommandDispatcher<S, T> {
+    pub fn dispatcher(&self) -> &CommandDispatcher<S> {
         &self.dispatcher
     }
 
@@ -152,7 +144,7 @@ where
         &self.range
     }
 
-    pub fn find_suggestion_context(&self, cursor: i32) -> Result<SuggestionContext<S, T>, String> {
+    pub fn find_suggestion_context(&self, cursor: i32) -> Result<SuggestionContext<S>, String> {
         if self.range.start() <= cursor {
             if self.range.end() < cursor {
                 if let Some(child) = self.child() {
diff --git a/azalea-brigadier/src/context/parsed_argument.rs b/azalea-brigadier/src/context/parsed_argument.rs
index 447a1223..e0bdf97b 100644
--- a/azalea-brigadier/src/context/parsed_argument.rs
+++ b/azalea-brigadier/src/context/parsed_argument.rs
@@ -3,12 +3,11 @@ use super::string_range::StringRange;
 #[derive(PartialEq, Eq, Hash, Clone)]
 pub struct ParsedArgument<T> {
     range: StringRange,
-    // T is an item in an enum
     result: T,
 }
 
 impl<T> ParsedArgument<T> {
-    fn new(start: usize, end: usize, result: T) -> Self {
+    fn new(start: usize, end: usize, result: &T) -> Self {
         Self {
             range: StringRange::between(start, end),
             result,
diff --git a/azalea-brigadier/src/context/parsed_command_node.rs b/azalea-brigadier/src/context/parsed_command_node.rs
index c0be355c..16c6ed8b 100644
--- a/azalea-brigadier/src/context/parsed_command_node.rs
+++ b/azalea-brigadier/src/context/parsed_command_node.rs
@@ -1,17 +1,17 @@
 use super::string_range::StringRange;
 use crate::tree::command_node::CommandNode;
 
-pub struct ParsedCommandNode<S, T> {
-    node: Box<dyn CommandNode<S, T>>,
+pub struct ParsedCommandNode<S> {
+    node: Box<dyn CommandNode<S>>,
     range: StringRange,
 }
 
-impl<S, T> ParsedCommandNode<S, T> {
-    fn new(node: dyn CommandNode<S, T>, range: StringRange) -> Self {
+impl<S> ParsedCommandNode<S> {
+    fn new(node: dyn CommandNode<S>, range: StringRange) -> Self {
         Self { node, range }
     }
 
-    fn node(&self) -> &dyn CommandNode<S, T> {
+    fn node(&self) -> &dyn CommandNode<S> {
         &self.node
     }
 
@@ -20,7 +20,7 @@ impl<S, T> ParsedCommandNode<S, T> {
     }
 }
 
-impl<S, T> Clone for ParsedCommandNode<S, T> {
+impl<S> Clone for ParsedCommandNode<S> {
     fn clone_from(&mut self, source: &Self) {
         Self {
             node: self.node.clone(),
diff --git a/azalea-brigadier/src/context/suggestion_context.rs b/azalea-brigadier/src/context/suggestion_context.rs
index 42bc550e..252cb6ed 100644
--- a/azalea-brigadier/src/context/suggestion_context.rs
+++ b/azalea-brigadier/src/context/suggestion_context.rs
@@ -1,6 +1,6 @@
 use crate::tree::command_node::CommandNode;
 
-pub struct SuggestionContext<'a, S, T> {
-    parent: &'a dyn CommandNode<S, T>,
+pub struct SuggestionContext<'a, S> {
+    parent: &'a dyn CommandNode<S>,
     start_pos: usize,
 }
diff --git a/azalea-brigadier/src/exceptions/builtin_exception_provider.rs b/azalea-brigadier/src/exceptions/builtin_exception_provider.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/exceptions/builtin_exception_provider.rs
+++ b/azalea-brigadier/src/exceptions/builtin_exception_provider.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/literal_message.rs b/azalea-brigadier/src/literal_message.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/literal_message.rs
+++ b/azalea-brigadier/src/literal_message.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/parse_results.rs b/azalea-brigadier/src/parse_results.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/parse_results.rs
+++ b/azalea-brigadier/src/parse_results.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/redirect_modifier.rs b/azalea-brigadier/src/redirect_modifier.rs
index fdb0a080..7a6d4db5 100644
--- a/azalea-brigadier/src/redirect_modifier.rs
+++ b/azalea-brigadier/src/redirect_modifier.rs
@@ -6,6 +6,6 @@ use crate::{
 };
 
 #[clonable]
-pub trait RedirectModifier<S, T>: Clone {
-    fn apply(&self, context: CommandContext<S, T>) -> Result<Vec<S>, CommandSyntaxException>;
+pub trait RedirectModifier<S>: Clone {
+    fn apply(&self, context: CommandContext<S>) -> Result<Vec<S>, CommandSyntaxException>;
 }
diff --git a/azalea-brigadier/src/result_consumer.rs b/azalea-brigadier/src/result_consumer.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/src/result_consumer.rs
+++ b/azalea-brigadier/src/result_consumer.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/src/single_redirect_modifier.rs b/azalea-brigadier/src/single_redirect_modifier.rs
index 95055fd8..dd63244d 100644
--- a/azalea-brigadier/src/single_redirect_modifier.rs
+++ b/azalea-brigadier/src/single_redirect_modifier.rs
@@ -3,6 +3,6 @@ use crate::{
     exceptions::command_syntax_exception::CommandSyntaxException,
 };
 
-pub trait SingleRedirectModifier<S, T> {
-    fn apply(&self, context: CommandContext<S, T>) -> Result<S, CommandSyntaxException>;
+pub trait SingleRedirectModifier<S> {
+    fn apply(&self, context: CommandContext<S>) -> Result<S, CommandSyntaxException>;
 }
diff --git a/azalea-brigadier/src/suggestion/suggestion_provider.rs b/azalea-brigadier/src/suggestion/suggestion_provider.rs
index 9720d3b9..3027d460 100644
--- a/azalea-brigadier/src/suggestion/suggestion_provider.rs
+++ b/azalea-brigadier/src/suggestion/suggestion_provider.rs
@@ -5,10 +5,10 @@ use crate::{
 
 use super::{suggestions::Suggestions, suggestions_builder::SuggestionsBuilder};
 
-pub trait SuggestionProvider<S, T> {
+pub trait SuggestionProvider<S> {
     fn suggestions(
         &self,
-        context: &CommandContext<S, T>,
+        context: &CommandContext<S>,
         builder: &SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException>;
 }
diff --git a/azalea-brigadier/src/suggestion/suggestions.rs b/azalea-brigadier/src/suggestion/suggestions.rs
index 778c5de8..9f0ee06d 100644
--- a/azalea-brigadier/src/suggestion/suggestions.rs
+++ b/azalea-brigadier/src/suggestion/suggestions.rs
@@ -4,7 +4,7 @@ use crate::{context::string_range::StringRange, message::Message};
 
 use super::suggestion::Suggestion;
 
-#[derive(PartialEq, Eq, Hash, Default)]
+#[derive(PartialEq, Eq, Hash)]
 pub struct Suggestions {
     range: StringRange,
     suggestions: Vec<Suggestions>,
diff --git a/azalea-brigadier/src/tree/argument_command_node.rs b/azalea-brigadier/src/tree/argument_command_node.rs
index 3fc1bb50..fb9a75fa 100644
--- a/azalea-brigadier/src/tree/argument_command_node.rs
+++ b/azalea-brigadier/src/tree/argument_command_node.rs
@@ -1,7 +1,10 @@
-use std::fmt::{Display, Formatter};
+use std::{
+    any::Any,
+    fmt::{Display, Formatter},
+};
 
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
+    arguments::argument_type::ArgumentType,
     builder::required_argument_builder::RequiredArgumentBuilder,
     context::{
         command_context::CommandContext, command_context_builder::CommandContextBuilder,
@@ -22,35 +25,27 @@ const USAGE_ARGUMENT_OPEN: &str = "<";
 const USAGE_ARGUMENT_CLOSE: &str = ">";
 
 #[derive(Clone)]
-pub struct ArgumentCommandNode<'a, S, T>
-where
-    // each argument command node has its own different type
-    T: ArgumentType<dyn Types>,
-{
+pub struct ArgumentCommandNode<'a, S> {
     name: String,
-    type_: &'a T,
-    custom_suggestions: Option<&'a dyn SuggestionProvider<S, T>>,
-    // custom_suggestions: &'a dyn SuggestionProvider<S, T>,
+    type_: Box<dyn ArgumentType<Into = dyn Any>>,
+    custom_suggestions: Option<&'a dyn SuggestionProvider<S>>,
+    // custom_suggestions: &'a dyn SuggestionProvider<S>,
     // Since Rust doesn't have extending, we put the struct this is extending as the "base" field
-    pub base: BaseCommandNode<'a, S, T>,
+    pub base: BaseCommandNode<'a, S>,
 }
 
-impl<S, T> ArgumentCommandNode<'_, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
-    fn get_type(&self) -> &T {
-        &self.type_
+impl<S> ArgumentCommandNode<'_, S> {
+    fn get_type(&self) -> &dyn ArgumentType<Into = dyn Any> {
+        self.type_
     }
 
-    fn custom_suggestions(&self) -> Option<&dyn SuggestionProvider<S, T>> {
+    fn custom_suggestions(&self) -> Option<&dyn SuggestionProvider<S>> {
         self.custom_suggestions
     }
 }
 
-impl<'a, S, T> CommandNode<S, T> for ArgumentCommandNode<'a, S, T>
+impl<'a, S> CommandNode<S> for ArgumentCommandNode<'a, S>
 where
-    T: ArgumentType<dyn Types> + Clone,
     S: Clone,
 {
     fn name(&self) -> &str {
@@ -60,11 +55,11 @@ where
     fn parse(
         &self,
         reader: &mut StringReader,
-        context_builder: CommandContextBuilder<S, T>,
+        context_builder: CommandContextBuilder<S>,
     ) -> Result<(), CommandSyntaxException> {
         // final int start = reader.getCursor();
         // final T result = type.parse(reader);
-        // final ParsedArgument<S, T> parsed = new ParsedArgument<>(start, reader.getCursor(), result);
+        // final ParsedArgument<S> parsed = new ParsedArgument<>(start, reader.getCursor(), result);
 
         // contextBuilder.withArgument(name, parsed);
         // contextBuilder.withNode(this, parsed.getRange());
@@ -81,7 +76,7 @@ where
 
     fn list_suggestions(
         &self,
-        context: CommandContext<S, T>,
+        context: CommandContext<S>,
         builder: &mut SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException> {
         if self.custom_suggestions.is_none() {
@@ -105,7 +100,7 @@ where
         USAGE_ARGUMENT_OPEN + self.name + USAGE_ARGUMENT_CLOSE
     }
 
-    fn create_builder(&self) -> RequiredArgumentBuilder<S, T> {
+    fn create_builder(&self) -> RequiredArgumentBuilder<S> {
         let builder = RequiredArgumentBuilder::argument(&self.name, &self.type_);
         builder.requires(self.base.get_requirement());
         builder.forward(
@@ -125,10 +120,7 @@ where
     }
 }
 
-impl<S, T> Display for ArgumentCommandNode<'_, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+impl<S> Display for ArgumentCommandNode<'_, S> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "<argument {}: {}>", self.name, self.type_)
     }
diff --git a/azalea-brigadier/src/tree/command_node.rs b/azalea-brigadier/src/tree/command_node.rs
index f3be1597..b8f416eb 100644
--- a/azalea-brigadier/src/tree/command_node.rs
+++ b/azalea-brigadier/src/tree/command_node.rs
@@ -1,6 +1,6 @@
 use super::{argument_command_node::ArgumentCommandNode, literal_command_node::LiteralCommandNode};
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
+    arguments::argument_type::ArgumentType,
     builder::argument_builder::ArgumentBuilder,
     command::Command,
     context::{command_context::CommandContext, command_context_builder::CommandContextBuilder},
@@ -10,29 +10,23 @@ use crate::{
     suggestion::{suggestions::Suggestions, suggestions_builder::SuggestionsBuilder},
 };
 use dyn_clonable::*;
-use std::{collections::HashMap, fmt::Debug};
+use std::{any::Any, collections::HashMap, fmt::Debug};
 
 #[derive(Default)]
-pub struct BaseCommandNode<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
-    children: HashMap<String, &'a dyn CommandNode<S, T>>,
-    literals: HashMap<String, LiteralCommandNode<'a, S, T>>,
-    arguments: HashMap<String, ArgumentCommandNode<'a, S, T>>,
+pub struct BaseCommandNode<'a, S> {
+    children: HashMap<String, &'a dyn CommandNode<S>>,
+    literals: HashMap<String, LiteralCommandNode<'a, S>>,
+    arguments: HashMap<String, ArgumentCommandNode<'a, S>>,
     requirement: Option<&'a dyn Fn(&S) -> bool>,
-    redirect: Option<&'a dyn CommandNode<S, T>>,
-    modifier: Option<&'a dyn RedirectModifier<S, T>>,
+    redirect: Option<&'a dyn CommandNode<S>>,
+    modifier: Option<&'a dyn RedirectModifier<S>>,
     forks: bool,
-    command: Option<&'a dyn Command<S, T>>,
+    command: Option<&'a dyn Command<S>>,
 }
 
-impl<S, T> BaseCommandNode<'_, S, T> where T: ArgumentType<dyn Types> {}
+impl<S> BaseCommandNode<'_, S> {}
 
-impl<S, T> Clone for BaseCommandNode<'_, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+impl<S> Clone for BaseCommandNode<'_, S> {
     fn clone(&self) -> Self {
         Self {
             children: self.children.clone(),
@@ -47,10 +41,7 @@ where
     }
 }
 
-impl<S, T> Debug for BaseCommandNode<'_, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+impl<S> Debug for BaseCommandNode<'_, S> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("BaseCommandNode")
             .field("children", &self.children)
@@ -66,23 +57,20 @@ where
 }
 
 #[clonable]
-pub trait CommandNode<S, T>: Clone
-where
-    T: ArgumentType<dyn Types>,
-{
+pub trait CommandNode<S>: Clone {
     fn name(&self) -> &str;
     fn usage_text(&self) -> &str;
     fn parse(
         &self,
         reader: &mut StringReader,
-        context_builder: CommandContextBuilder<S, T>,
+        context_builder: CommandContextBuilder<S>,
     ) -> Result<(), CommandSyntaxException>;
     fn list_suggestions(
         &self,
-        context: CommandContext<S, T>,
+        context: CommandContext<S>,
         builder: SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException>;
     fn is_valid_input(&self, input: &str) -> bool;
-    fn create_builder(&self) -> dyn ArgumentBuilder<S, T>;
+    fn create_builder(&self) -> dyn ArgumentBuilder<S, dyn Any>;
     fn get_examples(&self) -> Vec<String>;
 }
diff --git a/azalea-brigadier/src/tree/literal_command_node.rs b/azalea-brigadier/src/tree/literal_command_node.rs
index 021a3ea6..a722121f 100644
--- a/azalea-brigadier/src/tree/literal_command_node.rs
+++ b/azalea-brigadier/src/tree/literal_command_node.rs
@@ -1,5 +1,5 @@
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
+    arguments::argument_type::ArgumentType,
     builder::literal_argument_builder::LiteralArgumentBuilder,
     command::Command,
     context::{command_context::CommandContext, command_context_builder::CommandContextBuilder},
@@ -14,22 +14,15 @@ use crate::{
 use super::command_node::{BaseCommandNode, CommandNode};
 
 #[derive(Debug, Clone)]
-pub struct LiteralCommandNode<'a, S, T>
-where
-    // each argument command node has its own different type
-    T: ArgumentType<dyn Types>,
-{
+pub struct LiteralCommandNode<'a, S> {
     literal: String,
     literal_lowercase: String,
     // Since Rust doesn't have extending, we put the struct this is extending as the "base" field
-    pub base: BaseCommandNode<'a, S, T>,
+    pub base: BaseCommandNode<'a, S>,
 }
 
-impl<'a, S, T> LiteralCommandNode<'a, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
-    pub fn new(literal: String, base: BaseCommandNode<S, T>) -> Self {
+impl<'a, S> LiteralCommandNode<'a, S> {
+    pub fn new(literal: String, base: BaseCommandNode<S>) -> Self {
         let literal_lowercase = literal.to_lowercase();
         Self {
             literal,
@@ -59,9 +52,8 @@ where
     }
 }
 
-impl<S, T> CommandNode<S, T> for LiteralCommandNode<'_, S, T>
+impl<S> CommandNode<S> for LiteralCommandNode<'_, S>
 where
-    T: ArgumentType<dyn Types> + Clone,
     S: Clone,
 {
     fn name(&self) -> &str {
@@ -71,7 +63,7 @@ where
     fn parse(
         &self,
         reader: StringReader,
-        context_builder: CommandContextBuilder<S, T>,
+        context_builder: CommandContextBuilder<S>,
     ) -> Result<(), CommandSyntaxException> {
         let start = reader.get_cursor();
         let end = self.parse(reader);
@@ -87,7 +79,7 @@ where
 
     fn list_suggestions(
         &self,
-        context: CommandContext<S, T>,
+        context: CommandContext<S>,
         builder: SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException> {
         if self
@@ -108,7 +100,7 @@ where
         self.literal
     }
 
-    fn create_builder(&self) -> LiteralArgumentBuilder<S, T> {
+    fn create_builder(&self) -> LiteralArgumentBuilder<S> {
         let builder = LiteralArgumentBuilder::literal(self.literal());
         builder.requires(self.requirement());
         builder.forward(self.redirect(), self.redirect_modifier(), self.is_fork());
diff --git a/azalea-brigadier/src/tree/root_command_node.rs b/azalea-brigadier/src/tree/root_command_node.rs
index ded5fa77..c3139a05 100644
--- a/azalea-brigadier/src/tree/root_command_node.rs
+++ b/azalea-brigadier/src/tree/root_command_node.rs
@@ -1,7 +1,7 @@
 use std::fmt::{Display, Formatter};
 
 use crate::{
-    arguments::argument_type::{ArgumentType, Types},
+    arguments::argument_type::ArgumentType,
     context::{command_context::CommandContext, command_context_builder::CommandContextBuilder},
     exceptions::{
         builtin_exceptions::BuiltInExceptions, command_syntax_exception::CommandSyntaxException,
@@ -13,18 +13,13 @@ use crate::{
 use super::command_node::{BaseCommandNode, CommandNode};
 
 #[derive(Clone, Default)]
-pub struct RootCommandNode<'a, S, T>
-where
-    // each argument command node has its own different type
-    T: ArgumentType<dyn Types>,
-{
+pub struct RootCommandNode<'a, S> {
     // Since Rust doesn't have extending, we put the struct this is extending as the "base" field
-    pub base: BaseCommandNode<'a, S, T>,
+    pub base: BaseCommandNode<'a, S>,
 }
 
-impl<S, T> CommandNode<S, T> for RootCommandNode<'_, S, T>
+impl<S> CommandNode<S> for RootCommandNode<'_, S>
 where
-    T: ArgumentType<dyn Types> + Clone,
     S: Clone,
 {
     fn name(&self) -> &str {
@@ -34,13 +29,13 @@ where
     fn parse(
         &self,
         reader: StringReader,
-        context_builder: CommandContextBuilder<S, T>,
+        context_builder: CommandContextBuilder<S>,
     ) -> Result<(), CommandSyntaxException> {
     }
 
     fn list_suggestions(
         &self,
-        context: CommandContext<S, T>,
+        context: CommandContext<S>,
         builder: SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException> {
         Suggestions::empty()
@@ -63,10 +58,7 @@ where
     }
 }
 
-impl<S, T> Display for RootCommandNode<'_, S, T>
-where
-    T: ArgumentType<dyn Types>,
-{
+impl<S> Display for RootCommandNode<'_, S> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "<root>")
     }
diff --git a/azalea-brigadier/tests/command_dispatcher_test.rs b/azalea-brigadier/tests/command_dispatcher_test.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/tests/command_dispatcher_test.rs
+++ b/azalea-brigadier/tests/command_dispatcher_test.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/tests/command_dispatcher_usages_test.rs b/azalea-brigadier/tests/command_dispatcher_usages_test.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/tests/command_dispatcher_usages_test.rs
+++ b/azalea-brigadier/tests/command_dispatcher_usages_test.rs
@@ -0,0 +1 @@
+
diff --git a/azalea-brigadier/tests/command_suggestions_test.rs b/azalea-brigadier/tests/command_suggestions_test.rs
index e69de29b..8b137891 100644
--- a/azalea-brigadier/tests/command_suggestions_test.rs
+++ b/azalea-brigadier/tests/command_suggestions_test.rs
@@ -0,0 +1 @@
+