From 78b9216eb4fdba06759dbd0f19e8c8ea7d69a6bf Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Thu, 25 Sep 2014 10:38:59 +0200 Subject: [PATCH] Extracted " " into a constant for separating arguments --- src/main/java/net/minecraft/commands/CommandDispatcher.java | 2 ++ .../net/minecraft/commands/arguments/IntegerArgumentType.java | 3 ++- .../java/net/minecraft/commands/tree/LiteralCommandNode.java | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java index 29a8251..9e4dcc0 100644 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java @@ -10,6 +10,8 @@ import net.minecraft.commands.tree.CommandNode; import net.minecraft.commands.tree.RootCommandNode; public class CommandDispatcher { + public static final String ARGUMENT_SEPARATOR = " "; + private final RootCommandNode root = new RootCommandNode(); public void register(LiteralArgumentBuilder command) { diff --git a/src/main/java/net/minecraft/commands/arguments/IntegerArgumentType.java b/src/main/java/net/minecraft/commands/arguments/IntegerArgumentType.java index f6821f3..cc1850f 100644 --- a/src/main/java/net/minecraft/commands/arguments/IntegerArgumentType.java +++ b/src/main/java/net/minecraft/commands/arguments/IntegerArgumentType.java @@ -1,13 +1,14 @@ package net.minecraft.commands.arguments; import com.google.common.base.Splitter; +import net.minecraft.commands.CommandDispatcher; import net.minecraft.commands.context.CommandContext; import net.minecraft.commands.context.ParsedArgument; import net.minecraft.commands.exceptions.ArgumentValidationException; import net.minecraft.commands.exceptions.IllegalArgumentSyntaxException; public class IntegerArgumentType implements CommandArgumentType { - private static final Splitter SPLITTER = Splitter.on(' ').limit(2); + private static final Splitter SPLITTER = Splitter.on(CommandDispatcher.ARGUMENT_SEPARATOR).limit(2); private final int minimum; private final int maximum; diff --git a/src/main/java/net/minecraft/commands/tree/LiteralCommandNode.java b/src/main/java/net/minecraft/commands/tree/LiteralCommandNode.java index 8d3b1c5..ba98e32 100644 --- a/src/main/java/net/minecraft/commands/tree/LiteralCommandNode.java +++ b/src/main/java/net/minecraft/commands/tree/LiteralCommandNode.java @@ -1,6 +1,7 @@ package net.minecraft.commands.tree; import net.minecraft.commands.Command; +import net.minecraft.commands.CommandDispatcher; import net.minecraft.commands.context.CommandContextBuilder; import net.minecraft.commands.exceptions.ArgumentValidationException; import net.minecraft.commands.exceptions.IllegalArgumentSyntaxException; @@ -19,7 +20,7 @@ public class LiteralCommandNode extends CommandNode { @Override public String parse(String command, CommandContextBuilder contextBuilder) throws IllegalArgumentSyntaxException, ArgumentValidationException { - String expected = literal + (command.length() > literal.length() ? " " : ""); + String expected = literal + (command.length() > literal.length() ? CommandDispatcher.ARGUMENT_SEPARATOR : ""); if (!command.startsWith(expected)) { throw new IllegalArgumentSyntaxException();