azalea-brigadier now allows commands to return a Result

1 files changed, 11 insertions, 11 deletions

diff --git a/azalea-brigadier/src/builder/required_argument_builder.rs b/azalea-brigadier/src/builder/required_argument_builder.rs
index 01bfc0bc..e0822db3 100644
--- a/azalea-brigadier/src/builder/required_argument_builder.rs
+++ b/azalea-brigadier/src/builder/required_argument_builder.rs
@@ -16,16 +16,16 @@ use crate::{
 /// An argument node type.
 ///
 /// The `T` type parameter is the type of the argument, which can be anything.
-pub struct Argument<S> {
+pub struct Argument<S, R> {
     pub name: String,
     parser: Arc<dyn ArgumentType + Send + Sync>,
-    custom_suggestions: Option<Arc<dyn SuggestionProvider<S> + Send + Sync>>,
+    custom_suggestions: Option<Arc<dyn SuggestionProvider<S, R> + Send + Sync>>,
 }
-impl<S> Argument<S> {
+impl<S, R> Argument<S, R> {
     pub fn new(
         name: &str,
         parser: Arc<dyn ArgumentType + Send + Sync>,
-        custom_suggestions: Option<Arc<dyn SuggestionProvider<S> + Send + Sync>>,
+        custom_suggestions: Option<Arc<dyn SuggestionProvider<S, R> + Send + Sync>>,
     ) -> Self {
         Self {
             name: name.to_owned(),
@@ -40,7 +40,7 @@ impl<S> Argument<S> {
 
     pub fn list_suggestions(
         &self,
-        context: CommandContext<S>,
+        context: CommandContext<S, R>,
         builder: SuggestionsBuilder,
     ) -> Suggestions {
         if let Some(s) = &self.custom_suggestions {
@@ -55,13 +55,13 @@ impl<S> Argument<S> {
     }
 }
 
-impl<S> From<Argument<S>> for ArgumentBuilderType<S> {
-    fn from(argument: Argument<S>) -> Self {
+impl<S, R> From<Argument<S, R>> for ArgumentBuilderType<S, R> {
+    fn from(argument: Argument<S, R>) -> Self {
         Self::Argument(argument)
     }
 }
 
-impl<S> Debug for Argument<S> {
+impl<S, R> Debug for Argument<S, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Argument")
             .field("name", &self.name)
@@ -71,14 +71,14 @@ impl<S> Debug for Argument<S> {
 }
 
 /// Shortcut for creating a new argument builder node.
-pub fn argument<S>(
+pub fn argument<S, R>(
     name: &str,
     parser: impl ArgumentType + Send + Sync + 'static,
-) -> ArgumentBuilder<S> {
+) -> ArgumentBuilder<S, R> {
     ArgumentBuilder::new(Argument::new(name, Arc::new(parser), None).into())
 }
 
-impl<S> Clone for Argument<S> {
+impl<S, R> Clone for Argument<S, R> {
     fn clone(&self) -> Self {
         Self {
             name: self.name.clone(),