diff --git a/src/main/java/com/mojang/brigadier/context/CommandContext.java b/src/main/java/com/mojang/brigadier/context/CommandContext.java index b843c7b..023b7ae 100644 --- a/src/main/java/com/mojang/brigadier/context/CommandContext.java +++ b/src/main/java/com/mojang/brigadier/context/CommandContext.java @@ -39,7 +39,7 @@ public class CommandContext { throw new IllegalArgumentException("No such argument '" + name + "' exists on this command"); } - final Object result = argument.getResult(source); + final Object result = argument.getResult(); if (Primitives.wrap(clazz).isAssignableFrom(result.getClass())) { return (V) result; } else { diff --git a/src/main/java/com/mojang/brigadier/context/ParsedArgument.java b/src/main/java/com/mojang/brigadier/context/ParsedArgument.java index efb8dc9..ec5249a 100644 --- a/src/main/java/com/mojang/brigadier/context/ParsedArgument.java +++ b/src/main/java/com/mojang/brigadier/context/ParsedArgument.java @@ -13,7 +13,7 @@ public class ParsedArgument { return raw; } - public T getResult(S source) { + public T getResult() { return result; } diff --git a/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java b/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java index bb6b3a9..c2bbff8 100644 --- a/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java +++ b/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java @@ -33,21 +33,21 @@ public class BoolArgumentTypeTest { @Test public void parse_true() throws Exception { ParsedArgument parse = type.parse("true", context); - assertThat(parse.getResult(source), is(true)); + assertThat(parse.getResult(), is(true)); assertThat(parse.getRaw(), equalTo("true")); } @Test public void parse_false() throws Exception { ParsedArgument parse = type.parse("false", context); - assertThat(parse.getResult(source), is(false)); + assertThat(parse.getResult(), is(false)); assertThat(parse.getRaw(), equalTo("false")); } @Test public void parse_trailing() throws Exception { ParsedArgument parse = type.parse("false hello world", context); - assertThat(parse.getResult(source), is(false)); + assertThat(parse.getResult(), is(false)); assertThat(parse.getRaw(), equalTo("false")); } diff --git a/src/test/java/com/mojang/brigadier/arguments/CommandArgumentTypeTest.java b/src/test/java/com/mojang/brigadier/arguments/CommandArgumentTypeTest.java index 347598b..cf8adb4 100644 --- a/src/test/java/com/mojang/brigadier/arguments/CommandArgumentTypeTest.java +++ b/src/test/java/com/mojang/brigadier/arguments/CommandArgumentTypeTest.java @@ -37,7 +37,7 @@ public class CommandArgumentTypeTest { when(dispatcher.parse("hello world", source)).thenReturn(command); final ParsedArgument> argument = command().parse("hello world", new CommandContextBuilder<>(dispatcher, source)); assertThat(argument.getRaw(), equalTo("hello world")); - assertThat(argument.getResult(source), is(command)); + assertThat(argument.getResult(), is(command)); } @SuppressWarnings("unchecked") diff --git a/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java b/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java index 7e77360..b953a3f 100644 --- a/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java +++ b/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java @@ -43,7 +43,7 @@ public class IntegerArgumentTypeTest { ParsedArgument result = type.parse("50", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("50")); - assertThat(result.getResult(source), is(50)); + assertThat(result.getResult(), is(50)); } @Test @@ -51,7 +51,7 @@ public class IntegerArgumentTypeTest { ParsedArgument result = integer(0, 100, "L").parse("50L", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("50L")); - assertThat(result.getResult(source), is(50)); + assertThat(result.getResult(), is(50)); } @Test @@ -147,7 +147,7 @@ public class IntegerArgumentTypeTest { ParsedArgument result = type.parse("-100", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("-100")); - assertThat(result.getResult(source), is(-100)); + assertThat(result.getResult(), is(-100)); } @Test @@ -166,7 +166,7 @@ public class IntegerArgumentTypeTest { ParsedArgument result = type.parse("100", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("100")); - assertThat(result.getResult(source), is(100)); + assertThat(result.getResult(), is(100)); } @Test diff --git a/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java b/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java index 9b14f4a..b1572d0 100644 --- a/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java +++ b/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java @@ -44,7 +44,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("hello world", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("hello")); - assertThat(result.getResult(source), is("hello")); + assertThat(result.getResult(), is("hello")); } @Test @@ -53,7 +53,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("")); - assertThat(result.getResult(source), is("")); + assertThat(result.getResult(), is("")); } @Test @@ -62,7 +62,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("hello", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("hello")); - assertThat(result.getResult(source), is("hello")); + assertThat(result.getResult(), is("hello")); } @Test @@ -71,7 +71,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("hello world", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("hello")); - assertThat(result.getResult(source), is("hello")); + assertThat(result.getResult(), is("hello")); } @Test @@ -80,7 +80,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("hello world", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("hello world")); - assertThat(result.getResult(source), is("hello world")); + assertThat(result.getResult(), is("hello world")); } @Test @@ -89,7 +89,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("hello", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("hello")); - assertThat(result.getResult(source), is("hello")); + assertThat(result.getResult(), is("hello")); } @Test @@ -98,7 +98,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("\"hello \\\" world\"", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("\"hello")); - assertThat(result.getResult(source), is("\"hello")); + assertThat(result.getResult(), is("\"hello")); } @Test @@ -107,7 +107,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("\"hello \\\" world\"", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("\"hello \\\" world\"")); - assertThat(result.getResult(source), is("hello \" world")); + assertThat(result.getResult(), is("hello \" world")); } @Test @@ -116,7 +116,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("\"hello \\\" world\" with remaining", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("\"hello \\\" world\"")); - assertThat(result.getResult(source), is("hello \" world")); + assertThat(result.getResult(), is("hello \" world")); } @Test @@ -125,7 +125,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("hello world", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("hello")); - assertThat(result.getResult(source), is("hello")); + assertThat(result.getResult(), is("hello")); } @Test @@ -146,7 +146,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("\"hello\" world", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("\"hello\"")); - assertThat(result.getResult(source), is("hello")); + assertThat(result.getResult(), is("hello")); } @Test @@ -167,7 +167,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("hello \"world\"", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("hello")); - assertThat(result.getResult(source), is("hello")); + assertThat(result.getResult(), is("hello")); } @Test @@ -200,7 +200,7 @@ public class StringArgumentTypeTest { ParsedArgument result = type.parse("", new CommandContextBuilder<>(dispatcher, source)); assertThat(result.getRaw(), is("")); - assertThat(result.getResult(source), is("")); + assertThat(result.getResult(), is("")); } @Test diff --git a/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java b/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java index be6d53f..0509b7f 100644 --- a/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java +++ b/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java @@ -7,7 +7,6 @@ import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.context.CommandContextBuilder; import com.mojang.brigadier.exceptions.CommandException; @@ -47,7 +46,7 @@ public class ArgumentCommandNodeTest extends AbstractCommandNodeTest { assertThat(node.parse("123 456", contextBuilder), is(" 456")); assertThat(contextBuilder.getArguments().containsKey("foo"), is(true)); - assertThat(contextBuilder.getArguments().get("foo").getResult(source), is(123)); + assertThat(contextBuilder.getArguments().get("foo").getResult(), is(123)); } @Test @@ -55,7 +54,7 @@ public class ArgumentCommandNodeTest extends AbstractCommandNodeTest { assertThat(node.parse("123", contextBuilder), is("")); assertThat(contextBuilder.getArguments().containsKey("foo"), is(true)); - assertThat(contextBuilder.getArguments().get("foo").getResult(source), is(123)); + assertThat(contextBuilder.getArguments().get("foo").getResult(), is(123)); } @Test