EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity

CommandCaller

Browse Source
This commit is contained in:
boy0001
2015-07-28 01:14:38 +10:00
parent a39ec22c8c
commit 5a98c5410e
18 changed files with 163 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/intellectualsites/commands/Command.java
View File

@@ -8,16 +8,14 @@ import java.util.Set;
import com.intellectualcrafters.plot.commands.CommandCategory;
import com.intellectualcrafters.plot.commands.RequiredType;
import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotPlayer;
public abstract class Command extends CommandManager {
public abstract class Command<E extends CommandCaller> extends CommandManager {
private RequiredType requiredType = RequiredType.NONE;
private String command, usage = "", description = "", permission = "";
private Set<String> aliases = new HashSet<>();
private CommandCategory category;
protected Argument[] requiredArguments;
protected Argument<?>[] requiredArguments;
public Command() {
super(null, new ArrayList<Command>());
@@ -97,9 +95,9 @@ public abstract class Command extends CommandManager {
return this.command;
}
public abstract boolean onCommand(PlotPlayer plr, String[] arguments);
public abstract boolean onCommand(E plr, String[] arguments);
final public int handle(PlotPlayer plr, String[] args) {
final public int handle(E plr, String[] args) {
if (args.length == 0) {
return super.handle(plr, "");
}
@@ -131,7 +129,7 @@ public abstract class Command extends CommandManager {
return this.aliases;
}
final public Argument[] getRequiredArguments() {
final public Argument<?>[] getRequiredArguments() {
return this.requiredArguments;
}
@@ -150,7 +148,7 @@ public abstract class Command extends CommandManager {
if (getClass() != obj.getClass()) {
return false;
}
final Command other = (Command) obj;
final Command<?> other = (Command<?>) obj;
if (this.hashCode() != other.hashCode()) {
return false;
}

14
src/main/java/com/intellectualsites/commands/CommandCaller.java Normal file
View File

@@ -0,0 +1,14 @@
package com.intellectualsites.commands;
import com.intellectualcrafters.plot.commands.RequiredType;
import com.intellectualcrafters.plot.config.C;
public interface CommandCaller {
void sendMessage(final String message);
void sendMessage(C c, String ... args);
boolean hasPermission(final String perm);
RequiredType getSuperCaller();
}

41
src/main/java/com/intellectualsites/commands/CommandManager.java
View File

@@ -5,40 +5,41 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.commands.RequiredType;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.ConsolePlayer;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.MainUtil;
@SuppressWarnings("unused")
public class CommandManager {
public class CommandManager<T extends CommandCaller> {
protected final ConcurrentHashMap<String, Command> commands;
protected final ConcurrentHashMap<String, Command<T>> commands;
protected final Character initialCharacter;
public CommandManager() {
this('/', new ArrayList<Command>());
this('/', new ArrayList<Command<T>>());
}
public CommandManager(Character initialCharacter, List<Command> commands) {
public CommandManager(Character initialCharacter, List<Command<T>> commands) {
this.commands = new ConcurrentHashMap<>();
for (Command command : commands) {
for (Command<T> command : commands) {
addCommand(command);
}
this.initialCharacter = initialCharacter;
}
final public void addCommand(final Command command) {
final public void addCommand(final Command<T> command) {
this.commands.put(command.getCommand().toLowerCase(), command);
for (String alias : command.getAliases()) {
this.commands.put(alias.toLowerCase(), command);
}
}
final public boolean createCommand(final Command command) {
final public boolean createCommand(final Command<T> command) {
try {
command.create();
} catch(final Exception e) {
@@ -52,11 +53,11 @@ public class CommandManager {
return false;
}
final public ArrayList<Command> getCommands() {
ArrayList<Command> result = new ArrayList<>(this.commands.values());
Collections.sort(result, new Comparator<Command>() {
final public ArrayList<Command<T>> getCommands() {
ArrayList<Command<T>> result = new ArrayList<>(this.commands.values());
Collections.sort(result, new Comparator<Command<T>>() {
@Override
public int compare(Command a, Command b) {
public int compare(Command<T> a, Command<T> b) {
if (a == b) {
return 0;
}
@@ -71,8 +72,16 @@ public class CommandManager {
});
return result;
}
final public ArrayList<String> getCommandLabels(ArrayList<Command<T>> cmds) {
ArrayList<String> labels = new ArrayList<>(cmds.size());
for (Command<T> cmd : cmds) {
labels.add(cmd.getCommand());
}
return labels;
}
public int handle(PlotPlayer plr, String input) {
public int handle(T plr, String input) {
if (initialCharacter != null && !input.startsWith(initialCharacter + "")) {
return CommandHandlingOutput.NOT_COMMAND;
}
@@ -86,7 +95,7 @@ public class CommandManager {
args = new String[parts.length - 1];
System.arraycopy(parts, 1, args, 0, args.length);
}
Command cmd = null;
Command<T> cmd = null;
cmd = commands.get(command);
if (cmd == null) {
return CommandHandlingOutput.NOT_FOUND;
@@ -97,7 +106,7 @@ public class CommandManager {
if (!plr.hasPermission(cmd.getPermission())) {
return CommandHandlingOutput.NOT_PERMITTED;
}
Argument[] requiredArguments = cmd.getRequiredArguments();
Argument<?>[] requiredArguments = cmd.getRequiredArguments();
if (requiredArguments != null && requiredArguments.length > 0) {
boolean success = true;
if (args.length < requiredArguments.length) {
@@ -121,7 +130,7 @@ public class CommandManager {
if (!a) {
String usage = cmd.getUsage();
if (usage != null && !usage.isEmpty()) {
MainUtil.sendMessage(plr, usage);
plr.sendMessage(usage);
}
return CommandHandlingOutput.WRONG_USAGE;
}