Redstoner/CommandManager
Archived
0
Fork 0
Code Pull Requests Activity

Added "multiword" strings

Browse Source
This commit is contained in:
NEMESIS13cz
2016-10-16 10:26:15 +02:00
parent 1c0b0eac57
commit 80d27b488b
25 changed files with 1744 additions and 1652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
CmdMgrTest.java
View File

@@ -1,59 +1,59 @@
import java.io.File; import java.io.File;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.nemez.cmdmgr.Command; import com.nemez.cmdmgr.Command;
import com.nemez.cmdmgr.CommandManager; import com.nemez.cmdmgr.CommandManager;
public class CmdMgrTest extends JavaPlugin { public class CmdMgrTest extends JavaPlugin {
public void onEnable() { public void onEnable() {
CommandManager.registerCommand(new File("plugins/test.cmd"), this, this); CommandManager.registerCommand(new File("plugins/test.cmd"), this, this);
} }
public void onDisable() { public void onDisable() {
} }
@Command(hook="home_set") @Command(hook="home_set")
public boolean executeSetHome(CommandSender sender, String name) { public boolean executeSetHome(CommandSender sender, String name) {
sender.sendMessage("You executed:"); sender.sendMessage("You executed:");
sender.sendMessage("/home set " + name); sender.sendMessage("/home set " + name);
return true; return true;
} }
@Command(hook="home_set_coords") @Command(hook="home_set_coords")
public boolean executeSetHomeBasedOnCoords(CommandSender sender, String name, int x, int y, int z) { public boolean executeSetHomeBasedOnCoords(CommandSender sender, String name, int x, int y, int z) {
sender.sendMessage("You executed:"); sender.sendMessage("You executed:");
sender.sendMessage("/home set " + name + " " + x + " " + y + " " + z); sender.sendMessage("/home set " + name + " " + x + " " + y + " " + z);
return true; return true;
} }
@Command(hook="home_del") @Command(hook="home_del")
public void executeDelHome(CommandSender sender, String name, boolean aFlag) { public void executeDelHome(CommandSender sender, String name, boolean aFlag) {
sender.sendMessage("You executed:"); sender.sendMessage("You executed:");
sender.sendMessage("/home del " + name); sender.sendMessage("/home del " + name);
sender.sendMessage("-a - " + aFlag); sender.sendMessage("-a - " + aFlag);
} }
@Command(hook="home_list") @Command(hook="home_list")
public void executeListHomes(CommandSender sender) { public void executeListHomes(CommandSender sender) {
sender.sendMessage("You executed:"); sender.sendMessage("You executed:");
sender.sendMessage("/home list"); sender.sendMessage("/home list");
} }
@Command(hook="home_tp") @Command(hook="home_tp")
public void executeTeleportHome(CommandSender sender, String name) { public void executeTeleportHome(CommandSender sender, String name) {
sender.sendMessage("You executed:"); sender.sendMessage("You executed:");
sender.sendMessage("/home " + name); sender.sendMessage("/home " + name);
} }
@Command(hook="noskope") @Command(hook="noskope")
public boolean executeMagik(CommandSender sender) { public boolean executeMagik(CommandSender sender) {
sender.sendMessage("You executed:"); sender.sendMessage("You executed!!!!!!!!!:");
sender.sendMessage("/home yolo swag"); sender.sendMessage("/home yolo swag");
return true; return true;
} }
} }

8
README.md
View File

@@ -1,4 +1,4 @@
# CommandManager # CommandManager
Scripting-based Spigot/Bukkit command manager Scripting-based Spigot/Bukkit command manager
Feel free to use and PR enhancements/customizations! If you're a nice person, you can give me credit. Feel free to use and PR enhancements/customizations! If you're a nice person, you can give me credit.

26
com/nemez/cmdmgr/Command.java
View File

@@ -1,13 +1,13 @@
package com.nemez.cmdmgr; package com.nemez.cmdmgr;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface Command { public @interface Command {
String hook(); String hook();
} }

1235
com/nemez/cmdmgr/CommandManager.java
View File

File diff suppressed because it is too large Load Diff

24
com/nemez/cmdmgr/component/ArgumentComponent.java
View File

@@ -1,12 +1,12 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public abstract class ArgumentComponent implements ICommandComponent { public abstract class ArgumentComponent implements ICommandComponent {
public String argName; public String argName;
public int position; public int position;
@Override @Override
public String argName() { public String argName() {
return argName; return argName;
} }
} }

50
com/nemez/cmdmgr/component/BooleanComponent.java
View File

@@ -1,25 +1,25 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class BooleanComponent extends ArgumentComponent { public class BooleanComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
if (input.toLowerCase().equals("true") || input.toLowerCase().equals("yes")) { if (input.toLowerCase().equals("true") || input.toLowerCase().equals("yes")) {
return true; return true;
} }
return false; return false;
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
if (input.toLowerCase().equals("true") || input.toLowerCase().equals("false") || input.toLowerCase().equals("yes") || input.toLowerCase().equals("no")) { if (input.toLowerCase().equals("true") || input.toLowerCase().equals("false") || input.toLowerCase().equals("yes") || input.toLowerCase().equals("no")) {
return true; return true;
} }
return false; return false;
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":bool>"; return "<" + argName + ":bool>";
} }
} }

56
com/nemez/cmdmgr/component/ByteComponent.java
View File

@@ -1,28 +1,28 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class ByteComponent extends ArgumentComponent { public class ByteComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
try { try {
return Byte.parseByte(input); return Byte.parseByte(input);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return null; return null;
} }
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
try { try {
Byte.parseByte(input); Byte.parseByte(input);
return true; return true;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":i8>"; return "<" + argName + ":i8>";
} }
} }

100
com/nemez/cmdmgr/component/ChainComponent.java
View File

@@ -1,50 +1,50 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
import java.util.ArrayList; import java.util.ArrayList;
import com.nemez.cmdmgr.util.Type; import com.nemez.cmdmgr.util.Type;
public class ChainComponent implements ICommandComponent { public class ChainComponent implements ICommandComponent {
private ArrayList<ICommandComponent> components; private ArrayList<ICommandComponent> components;
public String permission; public String permission;
public String help; public String help;
public String execute; public String execute;
public Type type; public Type type;
public ChainComponent() { public ChainComponent() {
components = new ArrayList<ICommandComponent>(); components = new ArrayList<ICommandComponent>();
} }
public void append(ICommandComponent comp) { public void append(ICommandComponent comp) {
components.add(comp); components.add(comp);
} }
@Override @Override
public Object get(String input) { public Object get(String input) {
return components; return components;
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
return true; return true;
} }
@Override @Override
public String argName() { public String argName() {
return null; return null;
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "chain[" + components.size() + "]"; return "chain[" + components.size() + "]";
} }
public int capacity() { public int capacity() {
return components.size(); return components.size();
} }
public ArrayList<ICommandComponent> getComponents() { public ArrayList<ICommandComponent> getComponents() {
return components; return components;
} }
} }

66
com/nemez/cmdmgr/component/ConstantComponent.java
View File

@@ -1,33 +1,33 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class ConstantComponent implements ICommandComponent { public class ConstantComponent implements ICommandComponent {
private String component; private String component;
public ConstantComponent(String comp) { public ConstantComponent(String comp) {
component = comp; component = comp;
} }
@Override @Override
public Object get(String input) { public Object get(String input) {
if (input.equals(component)) { if (input.equals(component)) {
return input; return input;
} }
return null; return null;
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
return input.equals(component); return input.equals(component);
} }
@Override @Override
public String argName() { public String argName() {
return null; return null;
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return component; return component;
} }
} }

56
com/nemez/cmdmgr/component/DoubleComponent.java
View File

@@ -1,28 +1,28 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class DoubleComponent extends ArgumentComponent { public class DoubleComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
try { try {
return Double.parseDouble(input); return Double.parseDouble(input);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return null; return null;
} }
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
try { try {
Double.parseDouble(input); Double.parseDouble(input);
return true; return true;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":fp64>"; return "<" + argName + ":fp64>";
} }
} }

56
com/nemez/cmdmgr/component/FloatComponent.java
View File

@@ -1,28 +1,28 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class FloatComponent extends ArgumentComponent { public class FloatComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
try { try {
return Float.parseFloat(input); return Float.parseFloat(input);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return null; return null;
} }
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
try { try {
Float.parseFloat(input); Float.parseFloat(input);
return true; return true;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":fp32>"; return "<" + argName + ":fp32>";
} }
} }

18
com/nemez/cmdmgr/component/ICommandComponent.java
View File

@@ -1,9 +1,9 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public interface ICommandComponent { public interface ICommandComponent {
public Object get(String input); public Object get(String input);
public boolean valid(String input); public boolean valid(String input);
public String argName(); public String argName();
public String getComponentInfo(); public String getComponentInfo();
} }

56
com/nemez/cmdmgr/component/IntegerComponent.java
View File

@@ -1,28 +1,28 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class IntegerComponent extends ArgumentComponent { public class IntegerComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
try { try {
return Integer.parseInt(input); return Integer.parseInt(input);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return null; return null;
} }
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
try { try {
Integer.parseInt(input); Integer.parseInt(input);
return true; return true;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":i32>"; return "<" + argName + ":i32>";
} }
} }

54
com/nemez/cmdmgr/component/LongComponent.java
View File

@@ -1,28 +1,28 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class LongComponent extends ArgumentComponent { public class LongComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
try { try {
return Long.parseLong(input); return Long.parseLong(input);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return null; return null;
} }
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
try { try {
Long.parseLong(input); Long.parseLong(input);
return true; return true;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":i64>"; return "<" + argName + ":i64>";
} }
} }

38
com/nemez/cmdmgr/component/OptionalComponent.java
View File

@@ -1,19 +1,19 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class OptionalComponent extends ArgumentComponent { public class OptionalComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
return input.equals(argName); return input.equals(argName);
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
return input.equals(argName); return input.equals(argName);
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":flag>"; return "<" + argName + ":flag>";
} }
} }

54
com/nemez/cmdmgr/component/ShortComponent.java
View File

@@ -1,28 +1,28 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class ShortComponent extends ArgumentComponent { public class ShortComponent extends ArgumentComponent {
@Override @Override
public Object get(String input) { public Object get(String input) {
try { try {
return Short.parseShort(input); return Short.parseShort(input);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return null; return null;
} }
} }
@Override @Override
public boolean valid(String input) { public boolean valid(String input) {
try { try {
Short.parseShort(input); Short.parseShort(input);
return true; return true;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }
} }
@Override @Override
public String getComponentInfo() { public String getComponentInfo() {
return "<" + argName + ":i16>"; return "<" + argName + ":i16>";
} }
} }

40
com/nemez/cmdmgr/component/StringComponent.java
View File

@@ -1,19 +1,21 @@
package com.nemez.cmdmgr.component; package com.nemez.cmdmgr.component;
public class StringComponent extends ArgumentComponent { public class StringComponent extends ArgumentComponent {
@Override public boolean infinite = false;
public Object get(String input) {
return input; @Override
} public Object get(String input) {
return input;
@Override }
public boolean valid(String input) {
return true; @Override
} public boolean valid(String input) {
return true;
@Override }
public String getComponentInfo() {
return "<" + argName + ":str>"; @Override
} public String getComponentInfo() {
} return "<" + (infinite ? "..." : "") + argName + ":str>";
}
}

66
com/nemez/cmdmgr/util/BranchStack.java
View File

@@ -1,33 +1,33 @@
package com.nemez.cmdmgr.util; package com.nemez.cmdmgr.util;
import java.util.ArrayList; import java.util.ArrayList;
import com.nemez.cmdmgr.component.ChainComponent; import com.nemez.cmdmgr.component.ChainComponent;
public class BranchStack { public class BranchStack {
private ArrayList<ChainComponent> components; private ArrayList<ChainComponent> components;
public BranchStack() { public BranchStack() {
components = new ArrayList<ChainComponent>(); components = new ArrayList<ChainComponent>();
} }
public void push(ChainComponent comp) { public void push(ChainComponent comp) {
components.add(comp); components.add(comp);
} }
public ChainComponent pop() { public ChainComponent pop() {
if (components.size() > 0) { if (components.size() > 0) {
ChainComponent toPop = components.remove(components.size() - 1); ChainComponent toPop = components.remove(components.size() - 1);
return toPop; return toPop;
} }
return null; return null;
} }
public ChainComponent get() { public ChainComponent get() {
if (components.size() > 0) { if (components.size() > 0) {
return components.get(components.size() - 1); return components.get(components.size() - 1);
} }
return null; return null;
} }
} }

802
com/nemez/cmdmgr/util/Executable.java
View File

@@ -1,398 +1,404 @@
package com.nemez.cmdmgr.util; package com.nemez.cmdmgr.util;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandMap; import org.bukkit.command.CommandMap;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.nemez.cmdmgr.Command; import com.nemez.cmdmgr.Command;
import com.nemez.cmdmgr.CommandManager; import com.nemez.cmdmgr.CommandManager;
import com.nemez.cmdmgr.component.BooleanComponent; import com.nemez.cmdmgr.component.BooleanComponent;
import com.nemez.cmdmgr.component.ByteComponent; import com.nemez.cmdmgr.component.ByteComponent;
import com.nemez.cmdmgr.component.ConstantComponent; import com.nemez.cmdmgr.component.ConstantComponent;
import com.nemez.cmdmgr.component.DoubleComponent; import com.nemez.cmdmgr.component.DoubleComponent;
import com.nemez.cmdmgr.component.FloatComponent; import com.nemez.cmdmgr.component.FloatComponent;
import com.nemez.cmdmgr.component.ICommandComponent; import com.nemez.cmdmgr.component.ICommandComponent;
import com.nemez.cmdmgr.component.IntegerComponent; import com.nemez.cmdmgr.component.IntegerComponent;
import com.nemez.cmdmgr.component.LongComponent; import com.nemez.cmdmgr.component.LongComponent;
import com.nemez.cmdmgr.component.OptionalComponent; import com.nemez.cmdmgr.component.OptionalComponent;
import com.nemez.cmdmgr.component.ShortComponent; import com.nemez.cmdmgr.component.ShortComponent;
import com.nemez.cmdmgr.component.StringComponent; import com.nemez.cmdmgr.component.StringComponent;
public class Executable extends org.bukkit.command.Command { public class Executable extends org.bukkit.command.Command {
private ArrayList<ExecutableDefinition> commands; private ArrayList<ExecutableDefinition> commands;
private ArrayList<HelpPageCommand[]> help; private ArrayList<HelpPageCommand[]> help;
private String name; private String name;
private JavaPlugin plugin; private JavaPlugin plugin;
public Executable(String name, ArrayList<HelpPageCommand[]> help) { public Executable(String name, ArrayList<HelpPageCommand[]> help) {
super(name); super(name);
this.help = help; this.help = help;
this.name = name; this.name = name;
this.commands = new ArrayList<ExecutableDefinition>(); this.commands = new ArrayList<ExecutableDefinition>();
} }
public void register(ArrayList<Method> methods, JavaPlugin plugin, Object methodContainer) { public void register(ArrayList<Method> methods, JavaPlugin plugin, Object methodContainer) {
for (HelpPageCommand[] page : help) { for (HelpPageCommand[] page : help) {
for (HelpPageCommand cmd : page) { for (HelpPageCommand cmd : page) {
if (cmd != null) { if (cmd != null) {
processLine(cmd.usage.split("\\ "), cmd.permission, cmd.method, methods, methodContainer, plugin, cmd.type); processLine(cmd.usage.split("\\ "), cmd.permission, cmd.method, methods, methodContainer, plugin, cmd.type);
String newUsage = ""; String newUsage = "";
String buffer = ""; String buffer = "";
String typeBuffer = ""; String typeBuffer = "";
boolean ignore = false; boolean ignore = false;
boolean toBuffer = false; boolean toBuffer = false;
for (char c : cmd.usage.toCharArray()) { for (char c : cmd.usage.toCharArray()) {
if (c == '<') { if (c == '<') {
toBuffer = true; toBuffer = true;
}else if (c == ':') { }else if (c == ':') {
toBuffer = false; toBuffer = false;
ignore = true; ignore = true;
}else if (c == '>') { }else if (c == '>') {
ignore = false; ignore = false;
if (typeBuffer.equals("flag")) { if (typeBuffer.equals("flag")) {
newUsage += '[' + buffer + (CommandManager.debugHelpMenu ? ':' + typeBuffer : "") + ']'; newUsage += '[' + buffer + (CommandManager.debugHelpMenu ? ':' + typeBuffer : "") + ']';
}else{ }else{
newUsage += '<' + buffer + (CommandManager.debugHelpMenu ? ':' + typeBuffer : "") + '>'; newUsage += '<' + buffer + (CommandManager.debugHelpMenu ? ':' + typeBuffer : "") + '>';
} }
buffer = ""; buffer = "";
typeBuffer = ""; typeBuffer = "";
}else{ }else{
if (toBuffer) { if (toBuffer) {
buffer += c; buffer += c;
}else if (ignore) { }else if (ignore) {
typeBuffer += c; typeBuffer += c;
}else{ }else{
newUsage += c; newUsage += c;
} }
} }
} }
cmd.usage = newUsage; cmd.usage = newUsage;
} }
} }
} }
this.plugin = plugin; this.plugin = plugin;
try { try {
final Field cmdMap = Bukkit.getServer().getClass().getDeclaredField("commandMap"); final Field cmdMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
cmdMap.setAccessible(true); cmdMap.setAccessible(true);
CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer()); CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer());
map.register(name, this); map.register(name, this);
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().log(Level.SEVERE, "Failed to register command '" + name + "'!"); plugin.getLogger().log(Level.SEVERE, "Failed to register command '" + name + "'!");
e.printStackTrace(); e.printStackTrace();
} }
if (CommandManager.errors) { if (CommandManager.errors) {
plugin.getLogger().log(Level.WARNING, "There were parser errors, some commands may not function properly!"); plugin.getLogger().log(Level.WARNING, "There were parser errors, some commands may not function properly!");
CommandManager.errors = false; CommandManager.errors = false;
} }
} }
private void processLine(String[] line, String permission, String method, ArrayList<Method> methods, Object methodContainer, JavaPlugin plugin, Type etype) { private void processLine(String[] line, String permission, String method, ArrayList<Method> methods, Object methodContainer, JavaPlugin plugin, Type etype) {
ArrayList<ICommandComponent> command = new ArrayList<ICommandComponent>(); ArrayList<ICommandComponent> command = new ArrayList<ICommandComponent>();
if (method == null && line[1].equals("help")) { if (method == null && line[1].equals("help")) {
command.add(new ConstantComponent("help")); command.add(new ConstantComponent("help"));
IntegerComponent pageID = new IntegerComponent(); IntegerComponent pageID = new IntegerComponent();
pageID.argName = "page"; pageID.argName = "page";
command.add(pageID); command.add(pageID);
ExecutableDefinition def = new ExecutableDefinition(command, null, permission, null, methodContainer, Type.BOTH); ExecutableDefinition def = new ExecutableDefinition(command, null, permission, null, methodContainer, Type.BOTH);
commands.add(def); commands.add(def);
return; return;
} }
HashMap<Integer, ICommandComponent> methodParams = new HashMap<Integer, ICommandComponent>(); HashMap<Integer, ICommandComponent> methodParams = new HashMap<Integer, ICommandComponent>();
method = method.trim() + " "; method = method.trim() + " ";
String[] methodArray = method.split(" "); String[] methodArray = method.split(" ");
Method target = null; Method target = null;
ArrayList<Integer> links = new ArrayList<Integer>(); ArrayList<Integer> links = new ArrayList<Integer>();
for (String s : line) { for (String s : line) {
if (s.contains("/")) { if (s.contains("/")) {
continue; continue;
} }
if (s.contains(":")) { if (s.contains(":")) {
String[] type = s.split(":"); String[] type = s.split(":");
String paramName = ""; String paramName = "";
switch (type[1].substring(0, type[1].length() - 1)) { switch (type[1].substring(0, type[1].length() - 1)) {
case "i8": case "i8":
ByteComponent comp1 = new ByteComponent(); ByteComponent comp1 = new ByteComponent();
comp1.argName = type[0].substring(1); comp1.argName = type[0].substring(1);
paramName = comp1.argName; paramName = comp1.argName;
command.add(comp1); command.add(comp1);
break; break;
case "i16": case "i16":
ShortComponent comp2 = new ShortComponent(); ShortComponent comp2 = new ShortComponent();
comp2.argName = type[0].substring(1); comp2.argName = type[0].substring(1);
paramName = comp2.argName; paramName = comp2.argName;
command.add(comp2); command.add(comp2);
break; break;
case "i32": case "i32":
IntegerComponent comp3 = new IntegerComponent(); IntegerComponent comp3 = new IntegerComponent();
comp3.argName = type[0].substring(1); comp3.argName = type[0].substring(1);
paramName = comp3.argName; paramName = comp3.argName;
command.add(comp3); command.add(comp3);
break; break;
case "i64": case "i64":
LongComponent comp4 = new LongComponent(); LongComponent comp4 = new LongComponent();
comp4.argName = type[0].substring(1); comp4.argName = type[0].substring(1);
paramName = comp4.argName; paramName = comp4.argName;
command.add(comp4); command.add(comp4);
break; break;
case "fp32": case "fp32":
FloatComponent comp5 = new FloatComponent(); FloatComponent comp5 = new FloatComponent();
comp5.argName = type[0].substring(1); comp5.argName = type[0].substring(1);
paramName = comp5.argName; paramName = comp5.argName;
command.add(comp5); command.add(comp5);
break; break;
case "fp64": case "fp64":
DoubleComponent comp6 = new DoubleComponent(); DoubleComponent comp6 = new DoubleComponent();
comp6.argName = type[0].substring(1); comp6.argName = type[0].substring(1);
paramName = comp6.argName; paramName = comp6.argName;
command.add(comp6); command.add(comp6);
break; break;
case "str": case "str":
StringComponent comp7 = new StringComponent(); StringComponent comp7 = new StringComponent();
comp7.argName = type[0].substring(1); comp7.argName = type[0].substring(1).replace("...", "");
paramName = comp7.argName; comp7.infinite = type[0].substring(1).contains("...");
command.add(comp7); paramName = comp7.argName;
break; command.add(comp7);
case "bool": break;
BooleanComponent comp8 = new BooleanComponent(); case "bool":
comp8.argName = type[0].substring(1); BooleanComponent comp8 = new BooleanComponent();
paramName = comp8.argName; comp8.argName = type[0].substring(1);
command.add(comp8); paramName = comp8.argName;
break; command.add(comp8);
case "flag": break;
OptionalComponent comp9 = new OptionalComponent(); case "flag":
comp9.argName = type[0].substring(1); OptionalComponent comp9 = new OptionalComponent();
paramName = comp9.argName; comp9.argName = type[0].substring(1);
command.add(comp9); paramName = comp9.argName;
break; command.add(comp9);
default: break;
return; default:
} return;
int index = 0; }
for (int i = 1; i < methodArray.length; i++) { int index = 0;
if (methodArray[i] != null && !methodArray[i].trim().equals("")) { for (int i = 1; i < methodArray.length; i++) {
if (methodArray[i].trim().equals(paramName)) { if (methodArray[i] != null && !methodArray[i].trim().equals("")) {
methodParams.put(index, command.get(command.size() - 1)); if (methodArray[i].trim().equals(paramName)) {
links.add(index); methodParams.put(index, command.get(command.size() - 1));
break; links.add(index);
} break;
index++; }
} index++;
} }
}else{ }
command.add(new ConstantComponent(s)); }else{
} command.add(new ConstantComponent(s));
} }
}
for (Method m : methods) {
Command[] annotations = m.getAnnotationsByType(Command.class); for (Method m : methods) {
if (annotations == null || annotations.length != 1) { Command[] annotations = m.getAnnotationsByType(Command.class);
plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + ")"); if (annotations == null || annotations.length != 1) {
CommandManager.errors = true; plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + ")");
return; CommandManager.errors = true;
}else{ return;
if (annotations[0].hook().equals(methodArray[0])) { }else{
Class<?>[] params = m.getParameterTypes(); if (annotations[0].hook().equals(methodArray[0])) {
if (params.length -1 != methodParams.size()) { Class<?>[] params = m.getParameterTypes();
plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): Arguments don't match"); if (params.length -1 != methodParams.size()) {
CommandManager.errors = true; plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): Arguments don't match");
return; CommandManager.errors = true;
}else{ return;
for (int i = 0; i < params.length; i++) { }else{
if (i == 0) { for (int i = 0; i < params.length; i++) {
if (params[0] != CommandSender.class) { if (i == 0) {
plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): First argument is not CommandSender"); if (params[0] != CommandSender.class) {
CommandManager.errors = true; plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): First argument is not CommandSender");
return; CommandManager.errors = true;
} return;
}else{ }
ICommandComponent comp = methodParams.get(i - 1); }else{
if (comp instanceof ByteComponent && params[i] == byte.class) { ICommandComponent comp = methodParams.get(i - 1);
if (comp instanceof ByteComponent && params[i] == byte.class) {
}else if (comp instanceof ShortComponent && params[i] == short.class) {
}else if (comp instanceof ShortComponent && params[i] == short.class) {
}else if (comp instanceof IntegerComponent && params[i] == int.class) {
}else if (comp instanceof IntegerComponent && params[i] == int.class) {
}else if (comp instanceof LongComponent && params[i] == long.class) {
}else if (comp instanceof LongComponent && params[i] == long.class) {
}else if (comp instanceof FloatComponent && params[i] == float.class) {
}else if (comp instanceof FloatComponent && params[i] == float.class) {
}else if (comp instanceof DoubleComponent && params[i] == double.class) {
}else if (comp instanceof DoubleComponent && params[i] == double.class) {
}else if (comp instanceof StringComponent && params[i] == String.class) {
}else if (comp instanceof StringComponent && params[i] == String.class) {
}else if (comp instanceof BooleanComponent && params[i] == boolean.class) {
}else if (comp instanceof BooleanComponent && params[i] == boolean.class) {
}else if (comp instanceof OptionalComponent && params[i] == boolean.class) {
}else if (comp instanceof OptionalComponent && params[i] == boolean.class) {
}else{
plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): Invalid method arguments"); }else{
CommandManager.errors = true; plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): Invalid method arguments");
return; CommandManager.errors = true;
} return;
} }
} }
target = m; }
break; target = m;
} break;
} }
} }
} }
if (target == null) { }
plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): Method not found"); if (target == null) {
CommandManager.errors = true; plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): Method not found");
return; CommandManager.errors = true;
} return;
if (etype == null) { }
etype = Type.BOTH; if (etype == null) {
} etype = Type.BOTH;
ExecutableDefinition def = new ExecutableDefinition(command, links, permission, target, methodContainer, etype); }
commands.add(def); ExecutableDefinition def = new ExecutableDefinition(command, links, permission, target, methodContainer, etype);
} commands.add(def);
}
@Override
public boolean execute(CommandSender sender, String name, String[] args_) { @Override
char[] rawArgs = (String.join(" ", args_) + ' ').toCharArray(); public boolean execute(CommandSender sender, String name, String[] args_) {
int argSize = 0; char[] rawArgs = (String.join(" ", args_) + ' ').toCharArray();
char last = '\0'; int argSize = 0;
boolean inString = false; char last = '\0';
boolean inString = false;
for (char c : rawArgs) {
if (c == '"') { for (char c : rawArgs) {
if (last != '\\') { if (c == '"') {
inString = !inString; if (last != '\\') {
} inString = !inString;
}else if (c == ' ' && !inString) { }
argSize++; }else if (c == ' ' && !inString) {
} argSize++;
last = c; }
} last = c;
last = '\0'; }
String[] args = new String[argSize]; last = '\0';
String buffer = ""; String[] args = new String[argSize];
int index = 0; String buffer = "";
int index = 0;
for (char c : rawArgs) {
if (c == '"') { for (char c : rawArgs) {
if (last != '\\') { if (c == '"') {
inString = !inString; if (last != '\\') {
}else{ inString = !inString;
buffer = buffer.substring(0, buffer.length() - 1) + '"'; }else{
} buffer = buffer.substring(0, buffer.length() - 1) + '"';
}else if (c == ' ' && !inString) { }
args[index] = buffer; }else if (c == ' ' && !inString) {
buffer = ""; args[index] = buffer;
index++; buffer = "";
}else{ index++;
buffer += c; }else{
} buffer += c;
last = c; }
} last = c;
}
ArrayList<ExecutableDefinition> defs = new ArrayList<ExecutableDefinition>();
defs.addAll(commands); ArrayList<ExecutableDefinition> defs = new ArrayList<ExecutableDefinition>();
defLoop: for (int j = 0; j < defs.size(); j++) { defs.addAll(commands);
int i = 0, k = 0; defLoop: for (int j = 0; j < defs.size(); j++) {
for (; i < args.length; i++, k++) { int i = 0, k = 0;
if (!defs.get(j).valid(k, args[i])) { for (; i < args.length; i++, k++) {
if (!defs.get(j).isOptional(k)) { if (!defs.get(j).valid(k, args[i])) {
defs.remove(j); if (!defs.get(j).isOptional(k)) {
j--; defs.remove(j);
continue defLoop; j--;
}else{ continue defLoop;
i--; }else{
continue; i--;
} continue;
} }
} }
if (k != defs.get(j).getLength()) { }
defs.remove(j); if (k != defs.get(j).getLength(k)) {
j--; defs.remove(j);
} j--;
} }
if (args.length == 0 || defs.size() == 0) { }
printPage(sender, 1); if (args.length == 0 || defs.size() == 0) {
}else{ printPage(sender, 1);
ExecutableDefinition def = defs.get(0); }else{
for (ExecutableDefinition d : defs) { ExecutableDefinition def = defs.get(0);
if (d.isHelp() && args[0].equals("help")) { for (ExecutableDefinition d : defs) {
try { if (d.isHelp() && args[0].equals("help")) {
int page = Integer.parseInt(args[1]); try {
printPage(sender, page); int page = Integer.parseInt(args[1]);
} catch (Exception e) { printPage(sender, page);
printPage(sender, 1); } catch (Exception e) {
} printPage(sender, 1);
return true; }
} return true;
} }
if (def.getPermission() != null && !sender.hasPermission(def.getPermission())) { }
sender.sendMessage(CommandManager.noPermissionFormatting + "You do not have permission to execute this command."); if (def.getPermission() != null && !sender.hasPermission(def.getPermission())) {
return true; sender.sendMessage(CommandManager.noPermissionFormatting + "You do not have permission to execute this command.");
} return true;
if (def.getExecType() == Type.PLAYER) { }
if (!(sender instanceof Player)) { if (def.getExecType() == Type.PLAYER) {
sender.sendMessage(CommandManager.notAllowedFormatting + "Only players are allowed to run this command."); if (!(sender instanceof Player)) {
return true; sender.sendMessage(CommandManager.notAllowedFormatting + "Only players are allowed to run this command.");
} return true;
}else if (def.getExecType() == Type.CONSOLE) { }
if (sender instanceof Player) { }else if (def.getExecType() == Type.CONSOLE) {
sender.sendMessage(CommandManager.notAllowedFormatting + "Only console is allowed to run this command."); if (sender instanceof Player) {
return true; sender.sendMessage(CommandManager.notAllowedFormatting + "Only console is allowed to run this command.");
} return true;
}else if (def.getExecType() == Type.NOBODY) { }
sender.sendMessage(CommandManager.notAllowedFormatting + "Nobody can run this command."); }else if (def.getExecType() == Type.NOBODY) {
return true; sender.sendMessage(CommandManager.notAllowedFormatting + "Nobody can run this command.");
} return true;
ArrayList<Object> arguments = new ArrayList<Object>(); }
for (int i = 0, j = 0; i < args.length; i++, j++) { ArrayList<Object> arguments = new ArrayList<Object>();
if (def.isArgument(j)) { for (int i = 0, j = 0; i < args.length; i++, j++) {
if (def.valid(j, args[i])) { if (def.isArgument(j)) {
arguments.add(def.get(j, args[i])); if (def.valid(j, args[i])) {
}else if (def.isOptional(j)) { arguments.add(def.get(j, args[i]));
arguments.add(false); }else if (def.isOptional(j)) {
i--; arguments.add(false);
} i--;
} }
} }
Object[] linkedArgs = new Object[arguments.size() + 1]; }
for (int i = 0; i < arguments.size(); i++) { Object[] linkedArgs = new Object[def.getNumOfArgs() + 1];
linkedArgs[def.getLink(i) + 1] = arguments.get(i); for (int i = 0; i < arguments.size(); i++) {
} int link = def.getLink(i) + 1;
if (!def.invoke(linkedArgs, sender, plugin)) { if (linkedArgs[link] != null) {
printPage(sender, 1); linkedArgs[link] = linkedArgs[link].toString() + " " + arguments.get(i).toString();
} }else{
} linkedArgs[link] = arguments.get(i);
return true; }
} }
if (!def.invoke(linkedArgs, sender, plugin)) {
private void printPage(CommandSender sender, int page) { printPage(sender, 1);
page--; }
if (page < 0 || page >= help.size()) { }
sender.sendMessage(CommandManager.helpInvalidPageFormatting + "Non-existant page (" + (page + 1) + ").\nThere are " + help.size() + " pages."); return true;
}else{ }
HelpPageCommand[] pageData = help.get(page);
sender.sendMessage(CommandManager.helpPageHeaderFormatting + "### Help Page " + (page + 1) + "/" + (help.size()) + " ###"); private void printPage(CommandSender sender, int page) {
for (HelpPageCommand c : pageData) { page--;
if (c != null) { if (page < 0 || page >= help.size()) {
if (c.type == null || c.type == Type.BOTH || (c.type == Type.CONSOLE && !(sender instanceof Player)) || (c.type == Type.PLAYER && sender instanceof Player)) { sender.sendMessage(CommandManager.helpInvalidPageFormatting + "Non-existant page (" + (page + 1) + ").\nThere are " + help.size() + " pages.");
if (c.permission == null || sender.hasPermission(c.permission)) { }else{
sender.sendMessage(CommandManager.helpUsageFormatting + c.usage); HelpPageCommand[] pageData = help.get(page);
sender.sendMessage(CommandManager.helpDescriptionFormatting + c.description); sender.sendMessage(CommandManager.helpPageHeaderFormatting + "### Help Page " + (page + 1) + "/" + (help.size()) + " ###");
} for (HelpPageCommand c : pageData) {
} if (c != null) {
} if (c.type == null || c.type == Type.BOTH || (c.type == Type.CONSOLE && !(sender instanceof Player)) || (c.type == Type.PLAYER && sender instanceof Player)) {
} if (c.permission == null || sender.hasPermission(c.permission)) {
} sender.sendMessage(CommandManager.helpUsageFormatting + c.usage);
} sender.sendMessage(CommandManager.helpDescriptionFormatting + c.description);
} }
}
}
}
}
}
}

275
com/nemez/cmdmgr/util/ExecutableDefinition.java
View File

@@ -1,104 +1,171 @@
package com.nemez.cmdmgr.util; package com.nemez.cmdmgr.util;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.nemez.cmdmgr.CommandManager; import com.nemez.cmdmgr.CommandManager;
import com.nemez.cmdmgr.component.ArgumentComponent; import com.nemez.cmdmgr.component.ArgumentComponent;
import com.nemez.cmdmgr.component.ICommandComponent; import com.nemez.cmdmgr.component.ICommandComponent;
import com.nemez.cmdmgr.component.OptionalComponent; import com.nemez.cmdmgr.component.OptionalComponent;
import com.nemez.cmdmgr.component.StringComponent;
public class ExecutableDefinition {
public class ExecutableDefinition {
private ArrayList<ICommandComponent> components;
private String permission; private ArrayList<ICommandComponent> components;
private Method target; private String permission;
private Object methodContainer; private Method target;
private Type type; private Object methodContainer;
private ArrayList<Integer> paramLinks; private Type type;
private ArrayList<Integer> paramLinks;
public ExecutableDefinition(ArrayList<ICommandComponent> cmd, ArrayList<Integer> paramLinks, String perm, Method method, Object methodContainer, Type type) {
this.components = cmd; public ExecutableDefinition(ArrayList<ICommandComponent> cmd, ArrayList<Integer> paramLinks, String perm, Method method, Object methodContainer, Type type) {
this.permission = perm; this.components = cmd;
this.target = method; this.permission = perm;
this.methodContainer = methodContainer; this.target = method;
this.type = type; this.methodContainer = methodContainer;
this.paramLinks = paramLinks; this.type = type;
} this.paramLinks = paramLinks;
}
public boolean valid(int index, String arg) {
if (index < 0 || index >= components.size()) { public boolean valid(int index, String arg) {
return false; if (index < 0) {
} return false;
return components.get(index).valid(arg); }
} if (index >= components.size()) {
if (components.get(components.size() - 1) instanceof StringComponent) {
public Object get(int index, String arg) { StringComponent strComp = (StringComponent) components.get(components.size() - 1);
if (index < 0 || index >= components.size()) { if (strComp.infinite) {
return null; return strComp.valid(arg);
} }else{
return components.get(index).get(arg); return false;
} }
}else{
public boolean isArgument(int index) { return false;
if (index < 0 || index >= components.size()) { }
return false; }
} return components.get(index).valid(arg);
return components.get(index) instanceof ArgumentComponent; }
}
public Object get(int index, String arg) {
public boolean isOptional(int index) { if (index < 0) {
if (index < 0 || index >= components.size()) { return null;
return false; }
} if (index >= components.size()) {
return components.get(index) instanceof OptionalComponent; if (components.get(components.size() - 1) instanceof StringComponent) {
} StringComponent strComp = (StringComponent) components.get(components.size() - 1);
if (strComp.infinite) {
public boolean isHelp() { return strComp.get(arg);
return target == null && components.get(0).valid("help") && components.get(1).getComponentInfo().equals("<page:i32>"); }else{
} return null;
}
public String getPermission() { }else{
return permission; return null;
} }
}
public Type getExecType() { return components.get(index).get(arg);
return type; }
}
public boolean isArgument(int index) {
public int getLength() { if (index < 0) {
return components.size(); return false;
} }
if (index >= components.size()) {
public int getLink(int i) { if (components.get(components.size() - 1) instanceof StringComponent) {
if (i < 0 || i > paramLinks.size()) { StringComponent strComp = (StringComponent) components.get(components.size() - 1);
return i; if (strComp.infinite) {
} return true;
return paramLinks.get(i); }else{
} return false;
}
public boolean invoke(Object[] args, CommandSender sender, JavaPlugin plugin) { }else{
if (target == null) { return false;
return false; }
} }
args[0] = sender; return components.get(index) instanceof ArgumentComponent;
try { }
if (target.getReturnType() == void.class) {
target.invoke(methodContainer, args); public boolean isOptional(int index) {
return true; if (index < 0 || index >= components.size()) {
}else if (target.getReturnType() == boolean.class) { return false;
return (boolean) target.invoke(methodContainer, args); }
} return components.get(index) instanceof OptionalComponent;
} catch (Exception e) { }
sender.sendMessage(CommandManager.helpInvalidPageFormatting + "An internal error occured, please contact the server administrator and/or report a bug.");
plugin.getLogger().log(Level.WARNING, "Runtime Error: invalid method"); public boolean isHelp() {
e.printStackTrace(); return target == null && components.get(0).valid("help") && components.get(1).getComponentInfo().equals("<page:i32>");
return true; }
}
return false; public String getPermission() {
} return permission;
} }
public Type getExecType() {
return type;
}
public int getLength(int argSize) {
if (argSize >= components.size()) {
if (components.get(components.size() - 1) instanceof StringComponent) {
StringComponent strComp = (StringComponent) components.get(components.size() - 1);
if (strComp.infinite) {
return argSize;
}
}
}
return components.size();
}
public int getNumOfArgs() {
int counter = 0;
for (ICommandComponent c : components) {
if (c instanceof ArgumentComponent) {
counter++;
}
}
return counter;
}
public int getLink(int i) {
if (i < 0) {
return i;
}
if (i >= paramLinks.size()) {
if (components.get(components.size() - 1) instanceof StringComponent) {
StringComponent strComp = (StringComponent) components.get(components.size() - 1);
if (strComp.infinite) {
return paramLinks.get(paramLinks.size() - 1);
}else{
return i;
}
}else{
return i;
}
}
return paramLinks.get(i);
}
public boolean invoke(Object[] args, CommandSender sender, JavaPlugin plugin) {
if (target == null) {
return false;
}
args[0] = sender;
try {
if (target.getReturnType() == void.class) {
target.invoke(methodContainer, args);
return true;
}else if (target.getReturnType() == boolean.class) {
return (boolean) target.invoke(methodContainer, args);
}
} catch (Exception e) {
sender.sendMessage(CommandManager.helpInvalidPageFormatting + "An internal error occured, please contact the server administrator and/or report a bug.");
plugin.getLogger().log(Level.WARNING, "Runtime Error: invalid method");
e.printStackTrace();
return true;
}
return false;
}
}

36
com/nemez/cmdmgr/util/HelpPageCommand.java
View File

@@ -1,18 +1,18 @@
package com.nemez.cmdmgr.util; package com.nemez.cmdmgr.util;
public class HelpPageCommand { public class HelpPageCommand {
public String permission; public String permission;
public String usage; public String usage;
public String description; public String description;
public String method; public String method;
public Type type; public Type type;
public HelpPageCommand(String perm, String usage, String description, String method, Type type) { public HelpPageCommand(String perm, String usage, String description, String method, Type type) {
this.permission = perm; this.permission = perm;
this.usage = usage; this.usage = usage;
this.description = description; this.description = description;
this.method = method; this.method = method;
this.type = type; this.type = type;
} }
} }

14
com/nemez/cmdmgr/util/Property.java
View File

@@ -1,7 +1,7 @@
package com.nemez.cmdmgr.util; package com.nemez.cmdmgr.util;
public enum Property { public enum Property {
NONE, PERMISSION, HELP, EXECUTE, TYPE; NONE, PERMISSION, HELP, EXECUTE, TYPE;
} }

74
com/nemez/cmdmgr/util/Type.java
View File

@@ -1,37 +1,37 @@
package com.nemez.cmdmgr.util; package com.nemez.cmdmgr.util;
public enum Type { public enum Type {
BOTH, PLAYER, CONSOLE, NOBODY; BOTH, PLAYER, CONSOLE, NOBODY;
public static Type parse(String string) { public static Type parse(String string) {
if (string.equals("both")) { if (string.equals("both")) {
return BOTH; return BOTH;
}else if (string.equals("player")) { }else if (string.equals("player")) {
return PLAYER; return PLAYER;
}else if (string.equals("console")) { }else if (string.equals("console")) {
return CONSOLE; return CONSOLE;
}else if (string.equals("nobody")) { }else if (string.equals("nobody")) {
return NOBODY; return NOBODY;
}else{ }else{
return null; return null;
} }
} }
public static String get(Type t) { public static String get(Type t) {
if (t == null) { if (t == null) {
return "null"; return "null";
} }
switch (t) { switch (t) {
case BOTH: case BOTH:
return "both"; return "both";
case PLAYER: case PLAYER:
return "player"; return "player";
case CONSOLE: case CONSOLE:
return "console"; return "console";
case NOBODY: case NOBODY:
return "nobody"; return "nobody";
} }
return "null"; return "null";
} }
} }

6
plugin.yml
View File

@@ -1,4 +1,4 @@
name: CommandManagerTest name: CommandManagerTest
main: CmdMgrTest main: CmdMgrTest
version: 13.37 version: 13.37
author: Nemes author: Nemes

68
test.cmd
View File

@@ -1,35 +1,35 @@
command home { command home {
set [string:name] { set [string:name] {
[int:x] [int:y] [int:z] { [int:x] [int:y] [int:z] {
run home_set_coords name x y z; run home_set_coords name x y z;
perm home.set.xyz; perm home.set.xyz;
help Sets a new home at coordinates XYZ; help Sets a new home at coordinates XYZ;
} }
run home_set name; run home_set name;
perm home.set; perm home.set;
help Sets a new home; help Sets a new home;
type none; type none;
} }
del [optional:-a] [string:name] { del [optional:-a] [string:name] {
run home_del name -a; run home_del name -a;
help Deletes a home\n&cCannot be undone!; help Deletes a home\n&cCannot be undone!;
perm home.del; perm home.del;
} }
list { list {
help Shows all homes; help Shows all homes;
run home_list; run home_list;
perm home.list; perm home.list;
} }
[string:name] { [string:name] {
perm home.tp; perm home.tp;
help Teleports to a home; help Teleports to a home;
run home_tp name; run home_tp name;
} }
yolo swag { yolo swag {
perm yo.mamma; perm yo.mamma;
help Reks you; help Reks you;
run noskope; run noskope;
} }
} }