diff options
Diffstat (limited to 'src/main/java/com/nemez/cmdmgr/CommandManager.java')
| -rw-r--r-- | src/main/java/com/nemez/cmdmgr/CommandManager.java | 553 |
1 files changed, 266 insertions, 287 deletions
diff --git a/src/main/java/com/nemez/cmdmgr/CommandManager.java b/src/main/java/com/nemez/cmdmgr/CommandManager.java index d298ea1..a455a7b 100644 --- a/src/main/java/com/nemez/cmdmgr/CommandManager.java +++ b/src/main/java/com/nemez/cmdmgr/CommandManager.java @@ -1,11 +1,13 @@ //@noformat
package com.nemez.cmdmgr;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import com.nemez.cmdmgr.component.*;
+import com.nemez.cmdmgr.util.*;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandMap;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.*;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -15,81 +17,50 @@ import java.util.List; import java.util.Map;
import java.util.logging.Level;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandMap;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.nemez.cmdmgr.component.ArgumentComponent;
-import com.nemez.cmdmgr.component.BooleanComponent;
-import com.nemez.cmdmgr.component.ByteComponent;
-import com.nemez.cmdmgr.component.ChainComponent;
-import com.nemez.cmdmgr.component.ConstantComponent;
-import com.nemez.cmdmgr.component.DoubleComponent;
-import com.nemez.cmdmgr.component.EmptyComponent;
-import com.nemez.cmdmgr.component.FloatComponent;
-import com.nemez.cmdmgr.component.ICommandComponent;
-import com.nemez.cmdmgr.component.IntegerComponent;
-import com.nemez.cmdmgr.component.LongComponent;
-import com.nemez.cmdmgr.component.OptionalComponent;
-import com.nemez.cmdmgr.component.ShortComponent;
-import com.nemez.cmdmgr.component.StringComponent;
-import com.nemez.cmdmgr.util.BranchStack;
-import com.nemez.cmdmgr.util.Executable;
-import com.nemez.cmdmgr.util.HelpPageCommand;
-import com.nemez.cmdmgr.util.Property;
-import com.nemez.cmdmgr.util.Type;
-
/**
- * Example command.cmd
- *
- * command home:
- * set [string:name]:
- * run home_set name
- * help Set a new home
- * perm home.set
- * del [string:name]:
- * run home_del name
- * help Delete home\n&CCannot be undone!
- * perm home.del
- * list:
- * run home_list
- * help Show all homes
- * perm home.list
- * [string:name]:
- * run home_tp name
- * help Teleport to specified home
- * perm home.tp
+ * Example command.cmd
+ * <p>
+ * command home:
+ * set [string:name]:
+ * run home_set name
+ * help Set a new home
+ * perm home.set
+ * del [string:name]:
+ * run home_del name
+ * help Delete home\n&CCannot be undone!
+ * perm home.del
+ * list:
+ * run home_list
+ * help Show all homes
+ * perm home.list
+ * [string:name]:
+ * run home_tp name
+ * help Teleport to specified home
+ * perm home.tp
+ * <p>
+ * Generated in-game command structure:
+ * (will only show commands the user has permission to execute)
+ * <p>
+ * /home set <name>
+ * /home del <name>
+ * /home list
+ * /home <name>
+ * /home help
+ * <p>
+ * Java code:
*
- * Generated in-game command structure:
- * (will only show commands the user has permission to execute)
- *
- * /home set <name>
- * /home del <name>
- * /home list
- * /home <name>
- * /home help
- *
- * Java code:
- *
- * @Command(hook="home_set")
- * public void executeHomeSet(String name) {
- * ...
- * }
- *
- * @Command(hook="home_del")
- * public void executeHomeDelete(String name) {
- * ...
- * }
- *
- * @Command(hook="home_list")
- * public void executeHomeList() {
- * ...
- * }
- *
- * @Command(hook="home_tp")
- * public void executeHomeTeleport(String name) {
- * ...
- * }
+ * @Command(hook="home_set") public void executeHomeSet(String name) {
+ * ...
+ * }
+ * @Command(hook="home_del") public void executeHomeDelete(String name) {
+ * ...
+ * }
+ * @Command(hook="home_list") public void executeHomeList() {
+ * ...
+ * }
+ * @Command(hook="home_tp") public void executeHomeTeleport(String name) {
+ * ...
+ * }
*/
public class CommandManager {
@@ -97,27 +68,28 @@ public class CommandManager { /* Debugging toggle to generate help pages with types, e.g: str, i8, i32, fp64, etc. */
public static boolean debugHelpMenu = false;
/* Internal boolean to keep track of errors during resolving */
- public static boolean errors = false;
+ public static boolean errors = false;
/* Switches for color and formatting in the built-in help message and pagination text */
public static String helpDescriptionFormatting = "&b";
- public static String helpUsageFormatting = "&6";
- public static String helpPageHeaderFormatting = "&a";
+ public static String helpUsageFormatting = "&6";
+ public static String helpPageHeaderFormatting = "&a";
public static String helpInvalidPageFormatting = "&c";
- public static String noPermissionFormatting = "&c";
- public static String notAllowedFormatting = "&c";
-
+ public static String noPermissionFormatting = "&c";
+ public static String notAllowedFormatting = "&c";
+
/* List of all commands that can be invoked async */
- public static ArrayList<Executable> asyncExecutables = new ArrayList<Executable>();
- public static HashMap<Object, ArrayList<String>> commands = new HashMap<Object, ArrayList<String>>();
+ public static ArrayList<Executable> asyncExecutables = new ArrayList<Executable>();
+ public static HashMap<Object, ArrayList<String>> commands = new HashMap<Object, ArrayList<String>>();
/* */
-
+
/**
* Registers a command from a String of source code
- *
- * @param cmdSourceCode source code
+ *
+ * @param cmdSourceCode source code
* @param commandHandler instance of a class where your java functions are located
- * @param plugin your plugin class
+ * @param plugin your plugin class
+ *
* @return success - if command was processed and registered successfully
*/
public static boolean registerCommand(String cmdSourceCode, Object commandHandler, JavaPlugin plugin) {
@@ -125,7 +97,7 @@ public class CommandManager { return false;
}
/* get the class definition of the 'commandHandler' and get its functions */
- Method[] methods = commandHandler.getClass().getMethods();
+ Method[] methods = commandHandler.getClass().getMethods();
ArrayList<Method> finalMethods = new ArrayList<Method>();
/* extract all the functions annotated with @Command that are not static */
@@ -136,18 +108,19 @@ public class CommandManager { }
return parse(cmdSourceCode, finalMethods, plugin, commandHandler);
}
-
+
/**
* Registers a command from a source File
- *
- * @param sourceFile file containing source code
+ *
+ * @param sourceFile file containing source code
* @param commandHandler instance of a class where your java functions are located
- * @param plugin your plugin class
+ * @param plugin your plugin class
+ *
* @return success - if command was processed and registered successfully
*/
public static boolean registerCommand(File sourceFile, Object commandHandler, JavaPlugin plugin) {
StringBuilder src = new StringBuilder();
- String buf = "";
+ String buf = "";
try {
BufferedReader reader = new BufferedReader(new FileReader(sourceFile));
while ((buf = reader.readLine()) != null) {
@@ -163,18 +136,19 @@ public class CommandManager { }
return registerCommand(src.toString(), commandHandler, plugin);
}
-
+
/**
* Registers a command from an InputStream
- *
- * @param sourceStream input stream containing source code
+ *
+ * @param sourceStream input stream containing source code
* @param commandHandler instance of a class where your java functions are located
- * @param plugin your plugin class
+ * @param plugin your plugin class
+ *
* @return success - if command was processed and registered successfully
*/
public static boolean registerCommand(InputStream sourceStream, Object commandHandler, JavaPlugin plugin) {
StringBuilder src = new StringBuilder();
- String buf = "";
+ String buf = "";
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(sourceStream));
while ((buf = reader.readLine()) != null) {
@@ -189,16 +163,16 @@ public class CommandManager { }
return registerCommand(src.toString(), commandHandler, plugin);
}
-
+
/**
* Unregisters all commands from a source File
- *
+ *
* @param sourceFile file containing source code
- * @param plugin your plugin class
+ * @param plugin your plugin class
*/
public static void unregisterCommands(File sourceFile, JavaPlugin plugin) {
StringBuilder src = new StringBuilder();
- String buf = "";
+ String buf = "";
try {
BufferedReader reader = new BufferedReader(new FileReader(sourceFile));
while ((buf = reader.readLine()) != null) {
@@ -212,33 +186,10 @@ public class CommandManager { }
unregisterCommands(src.toString());
}
-
- /**
- * Unregisters all commands from an InputStream
- *
- * @param sourceStream input stream containing source code
- * @param plugin your plugin class
- */
- public static void unregisterCommands(InputStream sourceStream, JavaPlugin plugin) {
- StringBuilder src = new StringBuilder();
- String buf = "";
- try {
- BufferedReader reader = new BufferedReader(new InputStreamReader(sourceStream));
- while ((buf = reader.readLine()) != null) {
- src.append(buf + '\n');
- }
- reader.close();
- } catch (Exception e) {
- plugin.getLogger().log(Level.WARNING, "Error while loading command file. (" + sourceStream.toString() + ")");
- plugin.getLogger().log(Level.WARNING, e.getCause().toString());
- return;
- }
- unregisterCommands(src.toString());
- }
-
+
/**
* Unregisters all commands from a String of source code
- *
+ *
* @param cmdSourceCode source code
*/
public static void unregisterCommands(String cmdSourceCode) {
@@ -247,15 +198,15 @@ public class CommandManager { }
parseUnregister(cmdSourceCode);
}
-
+
public static void parseUnregister(String src) {
- char[] chars = src.toCharArray();
- StringBuilder buffer = new StringBuilder();
- int nesting = 0;
-
+ char[] chars = src.toCharArray();
+ StringBuilder buffer = new StringBuilder();
+ int nesting = 0;
+
for (int i = 0; i < chars.length; i++) {
char c = chars[i];
-
+
if (c == ';') {
if (nesting == 1) {
String[] alias = buffer.toString().trim().split("\\ ");
@@ -264,7 +215,7 @@ public class CommandManager { }
}
buffer = new StringBuilder();
- }else if (c == '{') {
+ } else if (c == '{') {
if (nesting == 0) {
String[] command = buffer.toString().trim().split("\\ ");
if (command.length == 2 && command[0].equals("command")) {
@@ -275,10 +226,10 @@ public class CommandManager { nesting++;
}
buffer = new StringBuilder();
- }else if (c == '}') {
+ } else if (c == '}') {
nesting--;
buffer = new StringBuilder();
- }else {
+ } else {
buffer.append(c);
}
}
@@ -286,7 +237,7 @@ public class CommandManager { /**
* Unregisters a command specified by its name or alias
- *
+ *
* @param name name or alias of command
*/
public static void unregisterCommand(String name) {
@@ -294,10 +245,10 @@ public class CommandManager { try {
final Field mapField = Bukkit.getServer().getClass().getDeclaredField("commandMap");
mapField.setAccessible(true);
- CommandMap map = (CommandMap) mapField.get(Bukkit.getServer());
+ CommandMap map = (CommandMap) mapField.get(Bukkit.getServer());
final Field knownCommandsField = mapField.getClass().getSuperclass().getDeclaredField("knownCommands");
knownCommandsField.setAccessible(true);
- @SuppressWarnings("unchecked")
+ @SuppressWarnings ("unchecked")
Map<String, Command> knownCommands = (Map<String, Command>) knownCommandsField.get(map);
knownCommands.remove(name);
map.register(name, empty);
@@ -305,19 +256,40 @@ public class CommandManager { e.printStackTrace();
}
}
-
- public static void unregisterAll(String[] commands)
- {
- for (String name : commands)
- {
+
+ /**
+ * Unregisters all commands from an InputStream
+ *
+ * @param sourceStream input stream containing source code
+ * @param plugin your plugin class
+ */
+ public static void unregisterCommands(InputStream sourceStream, JavaPlugin plugin) {
+ StringBuilder src = new StringBuilder();
+ String buf = "";
+ try {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(sourceStream));
+ while ((buf = reader.readLine()) != null) {
+ src.append(buf + '\n');
+ }
+ reader.close();
+ } catch (Exception e) {
+ plugin.getLogger().log(Level.WARNING, "Error while loading command file. (" + sourceStream.toString() + ")");
+ plugin.getLogger().log(Level.WARNING, e.getCause().toString());
+ return;
+ }
+ unregisterCommands(src.toString());
+ }
+
+ public static void unregisterAll(String[] commands) {
+ for (String name : commands) {
EmptyCommand emptyCommand = new EmptyCommand(name);
try {
final Field cmdMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
cmdMap.setAccessible(true);
- CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer());
+ CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer());
final Field knownCommandsField = map.getClass().getSuperclass().getDeclaredField("knownCommands");
knownCommandsField.setAccessible(true);
- @SuppressWarnings("unchecked")
+ @SuppressWarnings ("unchecked")
Map<String, Command> knownCommands = (Map<String, Command>) knownCommandsField.get(map);
knownCommands.remove(name);
map.register(name, emptyCommand);
@@ -326,26 +298,26 @@ public class CommandManager { }
}
}
-
+
public static void unregisterAllWithFallback(String fallback) {
try {
final Field cmdMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
cmdMap.setAccessible(true);
- CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer());
+ CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer());
final Field knownCommandsField = map.getClass().getSuperclass().getDeclaredField("knownCommands");
knownCommandsField.setAccessible(true);
- @SuppressWarnings("unchecked")
+ @SuppressWarnings ("unchecked")
Map<String, org.bukkit.command.Command> knownCommands = (Map<String, org.bukkit.command.Command>) knownCommandsField.get(map);
-
+
fallback = fallback.toLowerCase();
-
+
List<String> toRemove = new ArrayList<>();
- for (String key: knownCommands.keySet()) {
- org.bukkit.command.Command value = knownCommands.get(key);
- if ((value instanceof Executable) && ((Executable)value).getMethodContainerName().equals(fallback)) {
- toRemove.add(key);
- value.unregister(map);
+ for (String key : knownCommands.keySet()) {
+ org.bukkit.command.Command value = knownCommands.get(key);
+ if ((value instanceof Executable) && ((Executable) value).getMethodContainerName().equals(fallback)) {
+ toRemove.add(key);
+ value.unregister(map);
}
}
for (String key : toRemove) {
@@ -353,20 +325,21 @@ public class CommandManager { knownCommands.remove(key);
map.register(key, emptyCommand);
}
-
-
+
+
} catch (Exception e) {
e.printStackTrace();
}
}
-
+
/**
* Parses the source code into an abstract command syntax
- *
- * @param source String containing command source code
- * @param methods ArrayList of methods gathered from the plugin's handler class
- * @param plugin plugin to register commands as
+ *
+ * @param source String containing command source code
+ * @param methods ArrayList of methods gathered from the plugin's handler class
+ * @param plugin plugin to register commands as
* @param methodContainer class containing method handles
+ *
* @return success - if command parsing and registration was successful
*/
private static boolean parse(String source, ArrayList<Method> methods, JavaPlugin plugin, Object methodContainer) {
@@ -398,7 +371,7 @@ public class CommandManager { int line = 0;
// buffer for '...' and '"' properties of string types
StringBuilder sideBuffer = new StringBuilder();
-
+
/* iterate over all characters */
for (int i = 0; i < chars.length; i++) {
/* get current char */
@@ -421,7 +394,7 @@ public class CommandManager { plugin.getLogger().log(Level.WARNING, "Syntax error at line " + line + ": Already defining a type.");
errors = true;
return false;
- }else{
+ } else {
/* okay, resolve what type this is */
currentArgComp = resolveComponentType(buffer.toString());
buffer = new StringBuilder();
@@ -432,18 +405,18 @@ public class CommandManager { return false;
}
}
- }else{
+ } else {
/* not inside a type, probably just a string in the help property */
buffer.append(':');
}
- /* current is a semicolon, we just finished a property line */
- /* help this is an example; */
- /* ^ */
- }else if (current == ';') {
+ /* current is a semicolon, we just finished a property line */
+ /* help this is an example; */
+ /* ^ */
+ } else if (current == ';') {
/* semicolon is backslash escaped, treat it as a normal character */
if (previous == '\\') {
buffer.append(';');
- }else{
+ } else {
/* there is nothing on the stack, we are defining properties of 'nothing', throw an error */
if (stack.get() == null) {
plugin.getLogger().log(Level.WARNING, "Syntax error at line " + line + ": Not in code section.");
@@ -454,25 +427,27 @@ public class CommandManager { if (gettingAlias) {
stack.get().aliases.add(buffer.toString());
gettingAlias = false;
- }else if (currentProp == Property.HELP) {
+ } else if (currentProp == Property.HELP) {
stack.get().help = buffer.toString();
- /* same as above, except its the function to run */
- }else if (currentProp == Property.EXECUTE) {
+ /* same as above, except its the function to run */
+ } else if (currentProp == Property.EXECUTE) {
stack.get().execute = buffer.toString();
- /* same again, but with the permission, and as that should not contain spaces, trim it */
- }else if (currentProp == Property.PERMISSION) {
+ /* same again, but with the permission, and as that should not contain spaces, trim it */
+ } else if (currentProp == Property.PERMISSION) {
stack.get().permission = buffer.toString().trim();
- /* execution type, check if its a valid one and set it */
- }else if (currentProp == Property.TYPE) {
+ /* execution type, check if its a valid one and set it */
+ } else if (currentProp == Property.TYPE) {
stack.get().type = resolveExecutionType(buffer.toString().trim());
/* not a valid type, throw an error */
if (stack.get().type == null) {
- plugin.getLogger().log(Level.WARNING, "Attribute error at line " + line + ": Invalid attribute value. (" + buffer.toString().trim() + ").");
+ plugin
+ .getLogger()
+ .log(Level.WARNING, "Attribute error at line " + line + ": Invalid attribute value. (" + buffer.toString().trim() + ").");
errors = true;
return false;
}
- /* currently not defining anything, throw an error */
- }else{
+ /* currently not defining anything, throw an error */
+ } else {
plugin.getLogger().log(Level.WARNING, "Attribute error at line " + line + ": Invalid attribute type.");
errors = true;
return false;
@@ -481,8 +456,8 @@ public class CommandManager { currentProp = Property.NONE;
buffer = new StringBuilder();
}
- /* current is an opening curly bracket, we just entered a sub-command property definition */
- }else if (current == '{') {
+ /* current is an opening curly bracket, we just entered a sub-command property definition */
+ } else if (current == '{') {
/* increment bracket counter */
bracketCounter++;
/* are we getting the name of the command? */
@@ -490,14 +465,14 @@ public class CommandManager { /* set the command name to what we just gathered (trimmed) */
cmdName = buffer.toString().trim();
gettingName = false;
- }else{
+ } else {
/* are we currently in an argument? */
if (currentArgComp == null) {
/* no, but if there is something that looks like text, put it into the current subcommand as a constant */
if (buffer.toString().trim().length() > 0) {
currentChain.append(new ConstantComponent(buffer.toString().trim()));
}
- }else{
+ } else {
/* yes, put it into the current subcommand */
/* could happen when there are no 'spaces' */
/* [str:example]{ */
@@ -518,8 +493,8 @@ public class CommandManager { stack.push(currentChain);
/* reset our current sub-command */
currentChain = new ChainComponent();
- /* current is a closing curly bracket, we just finished a property section */
- }else if (current == '}') {
+ /* current is a closing curly bracket, we just finished a property section */
+ } else if (current == '}') {
/* decrement the bracket counter */
bracketCounter--;
/* pop whatever was on the stack */
@@ -558,42 +533,42 @@ public class CommandManager { continue;
}
currentChain = new ChainComponent();
- /* current is a space, we just finished defining which property we are about to set */
- }else if (current == ' ') {
+ /* current is a space, we just finished defining which property we are about to set */
+ } else if (current == ' ') {
/* we are already defining a property, append it as text */
if (currentProp != Property.NONE) {
buffer.append(' ');
- }else{
+ } else {
/* we got the 'command' definition, the name of the command will follow */
if (buffer.toString().equals("command") && !gettingName && !gettingAlias && cmdName == null) {
gettingName = true;
- /* we got other properties, their values will follow */
- }else if (buffer.toString().equals("alias") && !gettingAlias && !gettingName) {
+ /* we got other properties, their values will follow */
+ } else if (buffer.toString().equals("alias") && !gettingAlias && !gettingName) {
gettingAlias = true;
- }else if (buffer.toString().equals("help")) {
+ } else if (buffer.toString().equals("help")) {
currentProp = Property.HELP;
- }else if (buffer.toString().equals("run")) {
+ } else if (buffer.toString().equals("run")) {
currentProp = Property.EXECUTE;
- }else if (buffer.toString().equals("perm")) {
+ } else if (buffer.toString().equals("perm")) {
currentProp = Property.PERMISSION;
- }else if (buffer.toString().equals("type")) {
+ } else if (buffer.toString().equals("type")) {
currentProp = Property.TYPE;
- /* we didn't get any of those, we are probably in the middle of a sub-command definition */
- /* example [int:value] { */
- /* ^ ^ */
- }else{
+ /* we didn't get any of those, we are probably in the middle of a sub-command definition */
+ /* example [int:value] { */
+ /* ^ ^ */
+ } else {
/* we are getting the name and we didn't set it yet, set it */
if (gettingName && cmdName == null) {
cmdName = buffer.toString().trim();
gettingName = false;
- }else{
+ } else {
/* we aren't defining a type, put the current text into the sub-command as a constant */
if (currentArgComp == null) {
if (buffer.toString().trim().length() > 0) {
currentChain.append(new ConstantComponent(buffer.toString().trim()));
}
/* we are defining a command, put it into the sub-command */
- }else{
+ } else {
currentChain.append(currentArgComp);
currentArgComp = null;
}
@@ -602,41 +577,41 @@ public class CommandManager { /* reset the buffer */
buffer = new StringBuilder();
}
- /* current is an opening square bracket, we just started a type definition */
- }else if (current == '[') {
+ /* current is an opening square bracket, we just started a type definition */
+ } else if (current == '[') {
/* we are defining a property, treat it as text */
if (currentProp != Property.NONE) {
buffer.append('[');
- /* we are already inside of a type definition, throw an error */
- }else if (insideType) {
+ /* we are already inside of a type definition, throw an error */
+ } else if (insideType) {
plugin.getLogger().log(Level.WARNING, "Syntax error at line " + line + ": Invalid type declaration.");
errors = true;
return false;
- }else{
+ } else {
/* we just entered a type definition */
insideType = true;
}
- /* current is a closing square bracket, we just finished a type definition */
- }else if (current == ']') {
+ /* current is a closing square bracket, we just finished a type definition */
+ } else if (current == ']') {
/* we are defining a property, treat it as text */
if (currentProp != Property.NONE) {
buffer.append(']');
- /* we are inside of a type */
- }else if (insideType) {
+ /* we are inside of a type */
+ } else if (insideType) {
insideType = false;
/* current argument type is null, throw an error */
if (currentArgComp == null) {
currentArgComp = resolveComponentType(buffer.toString());
buffer = new StringBuilder();
if (currentArgComp instanceof EmptyComponent) {
-
- }else{
+
+ } else {
/* should never happen */
plugin.getLogger().log(Level.WARNING, "Type error at line " + line + ": Type has no type?");
errors = true;
return false;
}
- }else{
+ } else {
/* set the value of the current type and reset the buffer */
currentArgComp.argName = buffer.toString();
buffer = new StringBuilder();
@@ -646,109 +621,111 @@ public class CommandManager { }
sideBuffer = new StringBuilder();
}
- }else{
+ } else {
/* we are not defining a type, throw an error */
plugin.getLogger().log(Level.WARNING, "Syntax error at line " + line + ": Not in type declaration.");
errors = true;
return false;
}
- /* typical escape sequences and such */
- }else if (current == 'n' && currentProp == Property.HELP) {
+ /* typical escape sequences and such */
+ } else if (current == 'n' && currentProp == Property.HELP) {
if (previous == '\\') {
buffer.append('\n');
- }else{
+ } else {
buffer.append('n');
}
- }else if (current == 't' && currentProp == Property.HELP) {
+ } else if (current == 't' && currentProp == Property.HELP) {
if (previous == '\\') {
buffer.append('\t');
- }else{
+ } else {
buffer.append('t');
}
- }else if (current == '\\' && currentProp == Property.HELP) {
+ } else if (current == '\\' && currentProp == Property.HELP) {
if (previous == '\\') {
buffer.append('\\');
}
- }else if (current != '\r' && current != '\n' && current != '\t') {
+ } else if (current != '\r' && current != '\n' && current != '\t') {
if (currentArgComp != null && current == '.') {
if (currentArgComp instanceof StringComponent) {
sideBuffer.append(current);
- }else{
+ } else {
plugin.getLogger().log(Level.WARNING, "Syntax error at line " + line + ": '...' is invalid for non-string types.");
errors = true;
return false;
}
- }else{
+ } else {
buffer.append(current);
}
}
previous = current;
}
-
+
return true;
}
-
+
/**
* Resolves the string into a type, or null if invalid
- *
+ *
* @param type string you want to evaluate
+ *
* @return the type class or null if invalid
*/
private static ArgumentComponent resolveComponentType(String type) {
switch (type) {
- case "string":
- return new StringComponent();
- case "int":
- case "integer":
- return new IntegerComponent();
- case "short":
- return new ShortComponent();
- case "long":
- return new LongComponent();
- case "byte":
- return new ByteComponent();
- case "float":
- return new FloatComponent();
- case "double":
- return new DoubleComponent();
- case "bool":
- case "boolean":
- return new BooleanComponent();
- case "optional":
- case "opt":
- case "flag":
- return new OptionalComponent();
- case "empty":
- case "null":
- return new EmptyComponent();
+ case "string":
+ return new StringComponent();
+ case "int":
+ case "integer":
+ return new IntegerComponent();
+ case "short":
+ return new ShortComponent();
+ case "long":
+ return new LongComponent();
+ case "byte":
+ return new ByteComponent();
+ case "float":
+ return new FloatComponent();
+ case "double":
+ return new DoubleComponent();
+ case "bool":
+ case "boolean":
+ return new BooleanComponent();
+ case "optional":
+ case "opt":
+ case "flag":
+ return new OptionalComponent();
+ case "empty":
+ case "null":
+ return new EmptyComponent();
}
return null;
}
-
+
/**
* Resolves the string into a property, or null if invalid
- *
+ *
* @param type string you want to evaluate
+ *
* @return the property enum or null if invalid
*/
private static Type resolveExecutionType(String type) {
switch (type) {
- case "player":
- return Type.PLAYER;
- case "both":
- case "any":
- case "all":
- return Type.BOTH;
- case "server":
- case "console":
- return Type.CONSOLE;
- case "none":
- case "nobody":
- return Type.NOBODY;
+ case "player":
+ return Type.PLAYER;
+ case "both":
+ case "any":
+ case "all":
+ return Type.BOTH;
+ case "server":
+ case "console":
+ return Type.CONSOLE;
+ case "none":
+ case "nobody":
+ return Type.NOBODY;
}
return null;
}
-
+
private static void postProcess(String cmdName, ChainComponent components, ArrayList<Method> methods, JavaPlugin plugin, Object methodContainer) {
components.execute = null;
components.help = null;
@@ -757,21 +734,21 @@ public class CommandManager { Executable cmd = new Executable(cmdName, constructHelpPages(cmdName, components), methodContainer.getClass().getSimpleName());
cmd.register(methods, plugin, methodContainer, components.getAliases());
}
-
+
private static ArrayList<HelpPageCommand[]> constructHelpPages(String cmdName, ChainComponent root) {
- String[] rawLines = constructHelpPagesRecursive(root).split("\r");
- ArrayList<HelpPageCommand[]> pages = new ArrayList<HelpPageCommand[]>();
- ArrayList<String> lines = new ArrayList<String>();
- HelpPageCommand[] page = new HelpPageCommand[5];
-
+ String[] rawLines = constructHelpPagesRecursive(root).split("\r");
+ ArrayList<HelpPageCommand[]> pages = new ArrayList<HelpPageCommand[]>();
+ ArrayList<String> lines = new ArrayList<String>();
+ HelpPageCommand[] page = new HelpPageCommand[5];
+
for (int i = 0; i < rawLines.length; i++) {
if (rawLines[i].length() > 0 && !rawLines[i].equals("\0null\0null\0null\0null\0")) {
lines.add(rawLines[i]);
}
}
-
+
boolean firstPass = true;
- int i;
+ int i;
for (i = 0; i < lines.size(); i++) {
if (i % 5 == 0 && !firstPass) {
pages.add(page);
@@ -787,35 +764,37 @@ public class CommandManager { }
page[i % 5] = new HelpPageCommand(cmdName + ".help", "/" + cmdName + " help <page:i32>", "Shows help.", null, Type.BOTH);
pages.add(page);
-
+
return pages;
}
-
+
private static String constructHelpPagesRecursive(ICommandComponent component) {
String data = "";
-
+
if (component instanceof ChainComponent) {
- ChainComponent comp = (ChainComponent) component;
+ ChainComponent comp = (ChainComponent) component;
ArrayList<String> leaves = new ArrayList<String>();
- String chain = "";
+ String chain = "";
data += "\r";
for (ICommandComponent c : comp.getComponents()) {
String temp = constructHelpPagesRecursive(c);
if (c instanceof ChainComponent) {
temp = temp.replaceAll("\r", "\r" + chain);
leaves.add(temp);
- }else{
+ } else {
chain += temp;
}
}
- data += chain + "\0" + ((comp.permission == null || comp.permission.equals("-none-")) ? null : comp.permission) + "\0" + comp.execute + "\0" + comp.help + "\0" + Type.get(comp.type) + "\0";
+ data += chain + "\0" + ((comp.permission == null || comp.permission.equals("-none-"))
+ ? null
+ : comp.permission) + "\0" + comp.execute + "\0" + comp.help + "\0" + Type.get(comp.type) + "\0";
for (String s : leaves) {
data += s;
}
- }else{
+ } else {
data += component.getComponentInfo() + " ";
}
-
+
return data;
}
}//@format
|