Extracted " " into a constant for separating arguments

This commit is contained in:
Nathan Adams 2014-09-25 10:38:59 +02:00
parent 085f5b3d98
commit 78b9216eb4
3 changed files with 6 additions and 2 deletions

View file

@ -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) {

View file

@ -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<Integer> {
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;

View file

@ -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();