Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-30 18:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added merging of quoted multiword strings (single or double quotes) into one index, flags can be anywhere in the command args string. Untested and currently unused command aliasing added for moving commands around

Browse Source
This commit is contained in:
zml2008
2011-08-28 12:59:26 -07:00
parent 4dcbae03fe
commit 04dd21d51a
3 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java
View File

@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Set;
public class CommandContext {
protected static final String QUOTE_CHARS = "\'\"";
protected final String[] args;
protected final Set<Character> booleanFlags = new HashSet<Character>();
protected final Map<Character, String> valueFlags = new HashMap<Character, String>();
@ -34,25 +35,34 @@ public class CommandContext {
}
public CommandContext(String[] args) {
int i = 1;
for (; i < args.length; ++i) {
char quotedChar;
for (int i = 1; i < args.length; ++i) {
if (args[i].length() == 0) {
// Ignore this
args = removePortionOfArray(args, i, i, null);
} else if (QUOTE_CHARS.indexOf(String.valueOf(args[i].charAt(0))) != -1) {
StringBuilder build = new StringBuilder();
quotedChar = args[i].charAt(0);
int endIndex = i;
for (; endIndex < args.length; endIndex++) {
if (args[endIndex].charAt(args[endIndex].length() - 1) == quotedChar) {
if (endIndex != i) build.append(" ");
build.append(args[endIndex].substring(endIndex == i ? 1 : 0, args[endIndex].length() - 1));
break;
} else if (endIndex == i) {
build.append(args[endIndex].substring(1));
} else {
build.append(" ").append(args[endIndex]);
}
}
args = removePortionOfArray(args, i, endIndex, build.toString());
} else if (args[i].charAt(0) == '-' && args[i].matches("^-[a-zA-Z]+$")) {
for (int k = 1; k < args[i].length(); ++k) {
booleanFlags.add(args[i].charAt(k));
}
} else {
break;
args = removePortionOfArray(args, i, i, null);
}
}
String[] newArgs = new String[args.length - i + 1];
System.arraycopy(args, i, newArgs, 1, args.length - i);
newArgs[0] = args[0];
this.args = newArgs;
this.args = args;
}
public CommandContext(String args, Set<Character> isValueFlag) throws CommandException {
@ -223,4 +233,13 @@ public class CommandContext {
public int argsLength() {
return args.length - 1;
}
public static String[] removePortionOfArray(String[] array, int from, int to, String replace) {
String[] newArray = new String[from + array.length - to - (replace == null ? 1 : 0)];
System.arraycopy(array, 0, newArray, 0, from);
if (replace != null) newArray[from] = replace;
System.arraycopy(array, to + (replace == null ? 0 : 1), newArray, from + (replace == null ? 0 : 1),
array.length - to - 1);
return newArray;
}
}