From 43e18f6a04a3cc4069c2d2f32c1d94c9a9a68523 Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Mon, 6 Nov 2017 14:45:54 +0100
Subject: [PATCH] Allow redirect modifiers to throw exceptions

---
 .../java/com/mojang/brigadier/CommandDispatcher.java  |  2 +-
 .../java/com/mojang/brigadier/RedirectModifier.java   | 11 +++++++++++
 .../com/mojang/brigadier/builder/ArgumentBuilder.java |  7 ++++---
 .../mojang/brigadier/tree/ArgumentCommandNode.java    |  3 ++-
 .../java/com/mojang/brigadier/tree/CommandNode.java   |  7 ++++---
 .../com/mojang/brigadier/tree/LiteralCommandNode.java |  3 ++-
 .../com/mojang/brigadier/CommandDispatcherTest.java   |  2 +-
 7 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/com/mojang/brigadier/RedirectModifier.java

diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
index 6163bd4..6be44cf 100644
--- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java
+++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
@@ -87,7 +87,7 @@ public class CommandDispatcher<S> {
             final CommandContextBuilder<S> child = context.getChild();
             if (child != null) {
                 if (!child.getNodes().isEmpty()) {
-                    final Function<CommandContext<S>, Collection<S>> modifier = Iterators.getLast(context.getNodes().keySet().iterator()).getRedirectModifier();
+                    final RedirectModifier<S> modifier = Iterators.getLast(context.getNodes().keySet().iterator()).getRedirectModifier();
                     for (final S source : modifier.apply(context.build())) {
                         contexts.add(child.copy().withSource(source));
                     }
diff --git a/src/main/java/com/mojang/brigadier/RedirectModifier.java b/src/main/java/com/mojang/brigadier/RedirectModifier.java
new file mode 100644
index 0000000..0393e33
--- /dev/null
+++ b/src/main/java/com/mojang/brigadier/RedirectModifier.java
@@ -0,0 +1,11 @@
+package com.mojang.brigadier;
+
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface RedirectModifier<S> {
+    Collection<S> apply(CommandContext<S> context) throws CommandSyntaxException;
+}
diff --git a/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java b/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java
index 34b0e38..dbc3d49 100644
--- a/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java
+++ b/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java
@@ -1,6 +1,7 @@
 package com.mojang.brigadier.builder;
 
 import com.mojang.brigadier.Command;
+import com.mojang.brigadier.RedirectModifier;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
@@ -15,7 +16,7 @@ public abstract class ArgumentBuilder<S, T extends ArgumentBuilder<S, T>> {
     private Command<S> command;
     private Predicate<S> requirement = s -> true;
     private CommandNode<S> target;
-    private Function<CommandContext<S>, Collection<S>> modifier = s -> Collections.singleton(s.getSource());
+    private RedirectModifier<S> modifier = s -> Collections.singleton(s.getSource());
 
     protected abstract T getThis();
 
@@ -53,7 +54,7 @@ public abstract class ArgumentBuilder<S, T extends ArgumentBuilder<S, T>> {
         return redirect(target, modifier);
     }
 
-    public T redirect(final CommandNode<S> target, final Function<CommandContext<S>, Collection<S>> modifier) {
+    public T redirect(final CommandNode<S> target, final RedirectModifier<S> modifier) {
         if (!arguments.getChildren().isEmpty()) {
             throw new IllegalStateException("Cannot redirect a node with children");
         }
@@ -66,7 +67,7 @@ public abstract class ArgumentBuilder<S, T extends ArgumentBuilder<S, T>> {
         return target;
     }
 
-    public Function<CommandContext<S>, Collection<S>> getRedirectModifier() {
+    public RedirectModifier<S> getRedirectModifier() {
         return modifier;
     }
 
diff --git a/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java b/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java
index 079c3b5..8e2bb79 100644
--- a/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java
@@ -1,6 +1,7 @@
 package com.mojang.brigadier.tree;
 
 import com.mojang.brigadier.Command;
+import com.mojang.brigadier.RedirectModifier;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
@@ -21,7 +22,7 @@ public class ArgumentCommandNode<S, T> extends CommandNode<S> {
     private final String name;
     private final ArgumentType<T> type;
 
-    public ArgumentCommandNode(final String name, final ArgumentType<T> type, final Command<S> command, final Predicate<S> requirement, final CommandNode<S> redirect, final Function<CommandContext<S>, Collection<S>> modifier) {
+    public ArgumentCommandNode(final String name, final ArgumentType<T> type, final Command<S> command, final Predicate<S> requirement, final CommandNode<S> redirect, final RedirectModifier<S> modifier) {
         super(command, requirement, redirect, modifier);
         this.name = name;
         this.type = type;
diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
index 1b99ddf..a75f824 100644
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -3,6 +3,7 @@ package com.mojang.brigadier.tree;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.Maps;
 import com.mojang.brigadier.Command;
+import com.mojang.brigadier.RedirectModifier;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
@@ -21,10 +22,10 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
     private Map<Object, CommandNode<S>> children = Maps.newLinkedHashMap();
     private final Predicate<S> requirement;
     private final CommandNode<S> redirect;
-    private final Function<CommandContext<S>, Collection<S>> modifier;
+    private final RedirectModifier<S> modifier;
     private Command<S> command;
 
-    protected CommandNode(final Command<S> command, final Predicate<S> requirement, final CommandNode<S> redirect, final Function<CommandContext<S>, Collection<S>> modifier) {
+    protected CommandNode(final Command<S> command, final Predicate<S> requirement, final CommandNode<S> redirect, final RedirectModifier<S> modifier) {
         this.command = command;
         this.requirement = requirement;
         this.redirect = redirect;
@@ -43,7 +44,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
         return redirect;
     }
 
-    public Function<CommandContext<S>, Collection<S>> getRedirectModifier() {
+    public RedirectModifier<S> getRedirectModifier() {
         return modifier;
     }
 
diff --git a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java
index 84ec976..9f21c3f 100644
--- a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java
@@ -1,6 +1,7 @@
 package com.mojang.brigadier.tree;
 
 import com.mojang.brigadier.Command;
+import com.mojang.brigadier.RedirectModifier;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
@@ -18,7 +19,7 @@ public class LiteralCommandNode<S> extends CommandNode<S> {
 
     private final String literal;
 
-    public LiteralCommandNode(final String literal, final Command<S> command, final Predicate<S> requirement, final CommandNode<S> redirect, final Function<CommandContext<S>, Collection<S>> modifier) {
+    public LiteralCommandNode(final String literal, final Command<S> command, final Predicate<S> requirement, final CommandNode<S> redirect, final RedirectModifier<S> modifier) {
         super(command, requirement, redirect, modifier);
         this.literal = literal;
     }
diff --git a/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java b/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
index 43f0182..506973c 100644
--- a/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
+++ b/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
@@ -254,7 +254,7 @@ public class CommandDispatcherTest {
     @SuppressWarnings("unchecked")
     @Test
     public void testExecuteRedirected() throws Exception {
-        final Function<CommandContext<Object>, Collection<Object>> modifier = mock(Function.class);
+        final RedirectModifier<Object> modifier = mock(RedirectModifier.class);
         final Object source1 = new Object();
         final Object source2 = new Object();