Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-25 03:55:35 +01:00
Code Issues Projects Releases Wiki Activity

tweak help behavior

Browse Source
This commit is contained in:
Jesse Boyd 2017-04-10 14:01:33 +10:00
parent 554eae1fcf
commit e79559650f
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -807,10 +807,10 @@ public class BrushCommands {
aliases = { "flatten", "flatmap", "flat" }, aliases = { "flatten", "flatmap", "flat" },
usage = "[radius] [file|#clipboard|null] [rotation] [yscale]", usage = "[radius] [file|#clipboard|null] [rotation] [yscale]",
flags = "h", flags = "h",
desc = "Flatten brush makes terrain flatter\n" + help = "Flatten brush makes terrain flatter\n" +
"The -r flag enables random off-axis rotation\n" + "The -r flag enables random off-axis rotation\n" +
"The -l flag will work on snow layers", "The -l flag will work on snow layers",
help = desc =
"This brush raises and lowers land towards the clicked point\n", "This brush raises and lowers land towards the clicked point\n",
min = 1, min = 1,
max = 4 max = 4

90
core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
View File

@ -571,50 +571,12 @@ public class UtilityCommands {
boolean isRootLevel = true; boolean isRootLevel = true;
List<String> visited = new ArrayList<String>(); List<String> visited = new ArrayList<String>();
// Drill down to the command
for (int i = 0; i < effectiveLength; i++) {
String command = args.getString(i);
if (callable instanceof Dispatcher) {
// Chop off the beginning / if we're are the root level
if (isRootLevel && command.length() > 1 && command.charAt(0) == '/') {
command = command.substring(1);
}
CommandMapping mapping = detectCommand((Dispatcher) callable, command, isRootLevel);
if (mapping != null) {
callable = mapping.getCallable();
} else {
if (isRootLevel) {
if (effectiveLength != 1) {
actor.printError(String.format("The command '%s' could not be found.", args.getString(i)));
return;
}
break;
} else {
actor.printError(String.format("The sub-command '%s' under '%s' could not be found.",
command, Joiner.on(" ").join(visited)));
return;
}
}
effectiveLength--;
visited.add(args.getString(i));
isRootLevel = false;
} else {
actor.printError(String.format("'%s' has no sub-commands. (Maybe '%s' is for a parameter?)",
Joiner.on(" ").join(visited), command));
return;
}
}
// Create the message // Create the message
if (callable instanceof Dispatcher) { if (callable instanceof Dispatcher) {
Dispatcher dispatcher = (Dispatcher) callable; Dispatcher dispatcher = (Dispatcher) callable;
// Get a list of aliases // Get a list of aliases
List<CommandMapping> aliases = new ArrayList<CommandMapping>(dispatcher.getCommands()); List<CommandMapping> aliases = new ArrayList<CommandMapping>(dispatcher.getCommands());
List<String> cmdStrings = new ArrayList<>();
// Group by callable // Group by callable
if (page == -1 || effectiveLength > 0) { if (page == -1 || effectiveLength > 0) {
@ -636,10 +598,51 @@ public class UtilityCommands {
} }
if (effectiveLength > 0) { if (effectiveLength > 0) {
String cat = args.getString(0); String cat = args.getString(0);
aliases = grouped.get(cat); ArrayList<CommandMapping> mappings = grouped.get(cat);
if (aliases == null) { if (mappings == null) {
actor.printError(String.format("The command or group '%s' could not be found.", cat)); System.out.println("Aliases not found!");
// Drill down to the command
for (int i = 0; i < effectiveLength; i++) {
String command = args.getString(i);
if (callable instanceof Dispatcher) {
// Chop off the beginning / if we're are the root level
if (isRootLevel && command.length() > 1 && command.charAt(0) == '/') {
command = command.substring(1);
}
CommandMapping mapping = detectCommand((Dispatcher) callable, command, isRootLevel);
if (mapping != null) {
callable = mapping.getCallable();
} else {
if (isRootLevel) {
actor.printError(String.format("The command '%s' could not be found.", args.getString(i)));
return; return;
} else {
actor.printError(String.format("The sub-command '%s' under '%s' could not be found.",
command, Joiner.on(" ").join(visited)));
return;
}
}
effectiveLength--;
visited.add(args.getString(i));
isRootLevel = false;
} else {
actor.printError(String.format("'%s' has no sub-commands. (Maybe '%s' is for a parameter?)",
Joiner.on(" ").join(visited), command));
return;
}
}
if (!(callable instanceof Dispatcher)) {
actor.printRaw(ColorCodeBuilder.asColorCodes(new CommandUsageBox(callable, Joiner.on(" ").join(visited))));
return;
}
dispatcher = (Dispatcher) callable;
aliases = new ArrayList<CommandMapping>(dispatcher.getCommands());
} else {
System.out.println("Set aliases " + aliases);
aliases = mappings;
} }
page = Math.max(0, page); page = Math.max(0, page);
} else { } else {
@ -649,7 +652,7 @@ public class UtilityCommands {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
boolean first = true; boolean first = true;
for (Map.Entry<String, ArrayList<CommandMapping>> entry : grouped.entrySet()) { for (Map.Entry<String, ArrayList<CommandMapping>> entry : grouped.entrySet()) {
String s1 = "&a/" + cmd + " " + entry.getKey(); String s1 = "&a//help " + entry.getKey();
String s2 = entry.getValue().size() + ""; String s2 = entry.getValue().size() + "";
message.append(BBC.HELP_ITEM_ALLOWED.format(s1, s2) + "\n"); message.append(BBC.HELP_ITEM_ALLOWED.format(s1, s2) + "\n");
} }
@ -700,8 +703,7 @@ public class UtilityCommands {
actor.print(BBC.color(message.toString())); actor.print(BBC.color(message.toString()));
} }
} else { } else {
CommandUsageBox box = new CommandUsageBox(callable, Joiner.on(" ").join(visited)); actor.printRaw(ColorCodeBuilder.asColorCodes(new CommandUsageBox(callable, Joiner.on(" ").join(visited))));
actor.printRaw(ColorCodeBuilder.asColorCodes(box));
} }
} }