Upstream
/
BetterAlias
mirror of https://github.com/Ne0nx3r0/BetterAlias.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Catching up

This commit is contained in:
Ne0nx3r0 2016-08-09 21:45:28 -05:00
parent 6e92dfd56f
commit f5f2d72aa7
4 changed files with 280 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

603
com/ne0nx3r0/betteralias/alias/AliasManager.java
View File

@ -1,17 +1,6 @@
package com.ne0nx3r0.betteralias.alias; package com.ne0nx3r0.betteralias.alias;
import com.ne0nx3r0.betteralias.BetterAlias; import com.ne0nx3r0.betteralias.BetterAlias;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -19,28 +8,33 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.*;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
// Helper methods // Helper methods
public class AliasManager public class AliasManager {
{
private static BetterAlias plugin; private static BetterAlias plugin;
private HashMap<String, Alias> aliases; private HashMap<String, Alias> aliases;
public AliasManager(BetterAlias plugin) public AliasManager(BetterAlias plugin) {
{
AliasManager.plugin = plugin; AliasManager.plugin = plugin;
this.loadAliases(); this.loadAliases();
} }
public final boolean loadAliases() public final boolean loadAliases() {
{ this.aliases = new HashMap<String, Alias>();
this.aliases = new HashMap<String,Alias>();
File configFile = new File(plugin.getDataFolder(), "aliases.yml");
File configFile = new File(plugin.getDataFolder(), "aliases.yml");
if (!configFile.exists()) {
if(!configFile.exists())
{
configFile.getParentFile().mkdirs(); configFile.getParentFile().mkdirs();
copy(plugin.getResource("aliases.yml"), configFile); copy(plugin.getResource("aliases.yml"), configFile);
} }
@ -48,284 +42,218 @@ public class AliasManager
FileConfiguration yml = YamlConfiguration.loadConfiguration(configFile); FileConfiguration yml = YamlConfiguration.loadConfiguration(configFile);
Set<String> aliasList = yml.getKeys(false); Set<String> aliasList = yml.getKeys(false);
if(aliasList.isEmpty()) if (aliasList.isEmpty()) {
{
plugin.getLogger().log(Level.WARNING, "No aliases found in aliases.yml"); plugin.getLogger().log(Level.WARNING, "No aliases found in aliases.yml");
return false; return false;
} }
for(String sAlias : aliasList) for (String sAlias : aliasList) {
{
Alias alias = new Alias( Alias alias = new Alias(
sAlias, sAlias,
yml.getBoolean(sAlias+".caseSensitive",false), yml.getBoolean(sAlias + ".caseSensitive", false),
yml.getString(sAlias+".permission",null)); yml.getString(sAlias + ".permission", null));
for(String sArg : yml.getConfigurationSection(sAlias).getKeys(false)) for (String sArg : yml.getConfigurationSection(sAlias).getKeys(false)) {
{
List<AliasCommand> commandsList = new ArrayList<AliasCommand>(); List<AliasCommand> commandsList = new ArrayList<AliasCommand>();
if(!sArg.equalsIgnoreCase("permission") && !sArg.equalsIgnoreCase("caseSensitive"))
{
int iArg;
if(sArg.equals("*"))
{
iArg = -1;
}
else
{
iArg = Integer.parseInt(sArg);
}
List<String> sArgLines = new ArrayList<String>(); if (!sArg.equalsIgnoreCase("permission") && !sArg.equalsIgnoreCase("caseSensitive")) {
int iArg;
if(yml.isList(sAlias+"."+sArg)) if (sArg.equals("*")) {
{ iArg = -1;
sArgLines = yml.getStringList(sAlias+"."+sArg); } else {
} iArg = Integer.parseInt(sArg);
else }
{
sArgLines.add(yml.getString(sAlias+"."+sArg));
}
for(String sArgLine : sArgLines) List<String> sArgLines = new ArrayList<String>();
{
AliasCommandTypes type = AliasCommandTypes.PLAYER;
int waitTime = 0;
if(sArgLine.contains(" "))
{
String sType = sArgLine.substring(0,sArgLine.indexOf(" "));
if(sType.equalsIgnoreCase("console")) if (yml.isList(sAlias + "." + sArg)) {
{ sArgLines = yml.getStringList(sAlias + "." + sArg);
type = AliasCommandTypes.CONSOLE; } else {
sArgLines.add(yml.getString(sAlias + "." + sArg));
}
sArgLine = sArgLine.substring(sArgLine.indexOf(" ")+1); for (String sArgLine : sArgLines) {
AliasCommandTypes type = AliasCommandTypes.PLAYER;
int waitTime = 0;
if (sArgLine.contains(" ")) {
String sType = sArgLine.substring(0, sArgLine.indexOf(" "));
if (sType.equalsIgnoreCase("console")) {
type = AliasCommandTypes.CONSOLE;
sArgLine = sArgLine.substring(sArgLine.indexOf(" ") + 1);
} else if (sType.equalsIgnoreCase("player_as_op")) {
type = AliasCommandTypes.PLAYER_AS_OP;
sArgLine = sArgLine.substring(sArgLine.indexOf(" ") + 1);
} else if (sType.equalsIgnoreCase("reply")) {
type = AliasCommandTypes.REPLY_MESSAGE;
sArgLine = sArgLine.substring(sArgLine.indexOf(" ") + 1);
} else if (sType.equalsIgnoreCase("wait")) {
String[] sArgLineParams = sArgLine.split(" ");
try {
waitTime = Integer.parseInt(sArgLineParams[1]);
} catch (Exception e) {
plugin.getLogger().log(Level.WARNING, "Invalid wait time for command {0} in alias {1}, skipping line",
new Object[]{sArgLine, sAlias});
continue;
} }
else if(sType.equalsIgnoreCase("player_as_op"))
{
type = AliasCommandTypes.PLAYER_AS_OP;
sArgLine = sArgLine.substring(sArgLine.indexOf(" ")+1); if (sArgLineParams[2].equalsIgnoreCase("reply")) {
} type = AliasCommandTypes.WAIT_THEN_REPLY;
else if(sType.equalsIgnoreCase("reply"))
{
type = AliasCommandTypes.REPLY_MESSAGE;
sArgLine = sArgLine.substring(sArgLine.indexOf(" ")+1); sArgLine = sArgLine.replace(sArgLineParams[0] + " " + sArgLineParams[1] + " " + sArgLineParams[2] + " ", "");
} } else if (sArgLineParams[2].equalsIgnoreCase("console")) {
else if(sType.equalsIgnoreCase("wait")) type = AliasCommandTypes.WAIT_THEN_CONSOLE;
{
String[] sArgLineParams = sArgLine.split(" ");
try sArgLine = sArgLine.replace(sArgLineParams[0] + " " + sArgLineParams[1] + " " + sArgLineParams[2] + " ", "");
{ } else {
waitTime = Integer.parseInt(sArgLineParams[1]); type = AliasCommandTypes.WAIT;
}
catch(Exception e) sArgLine = sArgLine.replace(sArgLineParams[0] + " " + sArgLineParams[1] + " ", "");
{
plugin.getLogger().log(Level.WARNING, "Invalid wait time for command {0} in alias {1}, skipping line",
new Object[]{sArgLine, sAlias});
continue;
}
if(sArgLineParams[2].equalsIgnoreCase("reply"))
{
type = AliasCommandTypes.WAIT_THEN_REPLY;
sArgLine = sArgLine.replace(sArgLineParams[0]+" "+sArgLineParams[1]+" "+sArgLineParams[2]+" ", "");
}
else if(sArgLineParams[2].equalsIgnoreCase("console"))
{
type = AliasCommandTypes.WAIT_THEN_CONSOLE;
sArgLine = sArgLine.replace(sArgLineParams[0]+" "+sArgLineParams[1]+" "+sArgLineParams[2]+" ", "");
}
else
{
type = AliasCommandTypes.WAIT;
sArgLine = sArgLine.replace(sArgLineParams[0]+" "+sArgLineParams[1]+" ", "");
}
} }
} }
sArgLine = this.replaceColorCodes(sArgLine);
commandsList.add(new AliasCommand(sArgLine,type,waitTime));
} }
alias.setCommandsFor(iArg,commandsList); sArgLine = this.replaceColorCodes(sArgLine);
commandsList.add(new AliasCommand(sArgLine, type, waitTime));
} }
alias.setCommandsFor(iArg, commandsList);
}
} }
this.aliases.put(sAlias, alias); this.aliases.put(sAlias, alias);
} }
return true; return true;
} }
public boolean sendAliasCommands(Alias alias,CommandSender cs, String commandString) public boolean sendAliasCommands(Alias alias, CommandSender cs, String commandString) {
{
Player player = null; Player player = null;
if(cs instanceof Player) if (cs instanceof Player) {
{
player = (Player) cs; player = (Player) cs;
} }
List<String> args = new ArrayList<String>(); List<String> args = new ArrayList<String>();
Pattern regex = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'"); Pattern regex = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'");
Matcher regexMatcher = regex.matcher(commandString); Matcher regexMatcher = regex.matcher(commandString);
while(regexMatcher.find()) while (regexMatcher.find()) {
{ if (regexMatcher.group(1) != null) {
if(regexMatcher.group(1) != null)
{
// Add double-quoted string without the quotes // Add double-quoted string without the quotes
args.add(regexMatcher.group(1)); args.add(regexMatcher.group(1));
} } else if (regexMatcher.group(2) != null) {
else if (regexMatcher.group(2) != null)
{
// Add single-quoted string without the quotes // Add single-quoted string without the quotes
args.add(regexMatcher.group(2)); args.add(regexMatcher.group(2));
} } else {
else
{
// Add unquoted word // Add unquoted word
args.add(regexMatcher.group()); args.add(regexMatcher.group());
} }
} }
if(alias.hasCommandFor(args.size())) if (alias.hasCommandFor(args.size())) {
{ for (AliasCommand ac : alias.getCommands(args.size())) {
for(AliasCommand ac : alias.getCommands(args.size()))
{
String sAliasCommand = ac.command; String sAliasCommand = ac.command;
Matcher m = Pattern.compile("!([0-9a-zA-Z~*]+)").matcher(sAliasCommand); Matcher m = Pattern.compile("!([0-9a-zA-Z~*]+)").matcher(sAliasCommand);
StringBuffer sb = new StringBuffer(sAliasCommand.length()); StringBuffer sb = new StringBuffer(sAliasCommand.length());
while(m.find()) while (m.find()) {
{
String text = m.group(0).substring(1); String text = m.group(0).substring(1);
if(text.equalsIgnoreCase("name"))
{
if(player != null)
{
text = player.getName();
}
else
{
cs.sendMessage("[BetterAlias] "+ChatColor.RED+"A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: "+ac.command);
return true;
}
}
else if(text.equalsIgnoreCase("handItemName"))
{
if(player != null)
{
text = player.getItemInHand().getType().name();
}
else
{
cs.sendMessage("[BetterAlias] "+ChatColor.RED+"A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: "+ac.command);
return true;
}
}
else if(text.equalsIgnoreCase("handItemID"))
{
if(player != null)
{
text = new Integer(player.getItemInHand().getTypeId()).toString();
}
else
{
cs.sendMessage("[BetterAlias] "+ChatColor.RED+"A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: "+ac.command);
return true;
}
}
else if(text.equalsIgnoreCase("oppositeGameMode"))
{
if(player != null)
{
text = player.getGameMode().equals(GameMode.SURVIVAL)?"creative":"survival";
}
else
{
cs.sendMessage("[BetterAlias] "+ChatColor.RED+"A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: "+ac.command);
return true;
}
}
else if(text.equalsIgnoreCase("*"))
{
text = commandString;
}
else if(text.length() >= 2 && text.substring(1,2).equalsIgnoreCase("p"))
{
int iParam = -1;
try
{
iParam = Integer.parseInt(text.substring(0,1));
}
catch(Exception ex){}
if(iParam > -1 && args.size() >= iParam) if (text.equalsIgnoreCase("name")) {
{ if (player != null) {
String sPlayerName = args.get(iParam-1).toLowerCase(); text = player.getName();
} else {
cs.sendMessage("[BetterAlias] " + ChatColor.RED + "A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: " + ac.command);
return true;
}
} else if (text.equalsIgnoreCase("handItemName")) {
if (player != null) {
text = player.getItemInHand().getType().name();
} else {
cs.sendMessage("[BetterAlias] " + ChatColor.RED + "A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: " + ac.command);
return true;
}
} else if (text.equalsIgnoreCase("handItemID")) {
if (player != null) {
text = new Integer(player.getItemInHand().getTypeId()).toString();
} else {
cs.sendMessage("[BetterAlias] " + ChatColor.RED + "A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: " + ac.command);
return true;
}
} else if (text.equalsIgnoreCase("oppositeGameMode")) {
if (player != null) {
text = player.getGameMode().equals(GameMode.SURVIVAL) ? "creative" : "survival";
} else {
cs.sendMessage("[BetterAlias] " + ChatColor.RED + "A parameter of this alias requires a player.");
cs.sendMessage("[BetterAlias] Line: " + ac.command);
return true;
}
} else if (text.equalsIgnoreCase("*")) {
//ltrim emulation
while(commandString.length() > 0 && commandString.substring(0,1).equals(" ")){
commandString = commandString.substring(1);
}
text = commandString;
} else if (text.length() >= 2 && text.substring(1, 2).equalsIgnoreCase("p")) {
int iParam = -1;
try {
iParam = Integer.parseInt(text.substring(0, 1));
} catch (Exception ex) {
}
if (iParam > -1 && args.size() >= iParam) {
String sPlayerName = args.get(iParam - 1).toLowerCase();
text = "BetterAliasPlayerNotFound"; text = "BetterAliasPlayerNotFound";
for(Player p : plugin.getServer().getOnlinePlayers()) for (Player p : plugin.getServer().getOnlinePlayers()) {
{ if (p.getName().toLowerCase().contains(sPlayerName)) {
if(p.getName().toLowerCase().contains(sPlayerName))
{
text = p.getName(); text = p.getName();
break; break;
} }
} }
} }
} } else {
else
{
int iParam = -1; int iParam = -1;
try try {
{
iParam = Integer.parseInt(text); iParam = Integer.parseInt(text);
} catch (Exception ex) {
} }
catch(Exception ex){}
if (iParam > -1 && args.size() >= iParam) {
if(iParam > -1 && args.size() >= iParam) text = args.get(iParam - 1);
{ } else {
text = args.get(iParam-1);
}
else
{
text = ""; text = "";
} }
} }
@ -334,200 +262,149 @@ public class AliasManager
} }
m.appendTail(sb); m.appendTail(sb);
String sNewCommand = sb.toString(); String sNewCommand = sb.toString();
if(ac.type.equals(AliasCommandTypes.REPLY_MESSAGE)) if (ac.type.equals(AliasCommandTypes.REPLY_MESSAGE)) {
{
cs.sendMessage(sNewCommand); cs.sendMessage(sNewCommand);
} } else if (ac.type.equals(AliasCommandTypes.WAIT_THEN_REPLY)) {
else if(ac.type.equals(AliasCommandTypes.WAIT_THEN_REPLY))
{
final CommandSender csWait = cs; final CommandSender csWait = cs;
final String message = sNewCommand; final String message = sNewCommand;
plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable() plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable() {
{ public void run() {
public void run()
{
csWait.sendMessage(message); csWait.sendMessage(message);
} }
}, ac.waitTime); }, ac.waitTime);
} } else if (ac.type.equals(AliasCommandTypes.WAIT_THEN_CONSOLE)) {
else if(ac.type.equals(AliasCommandTypes.WAIT_THEN_CONSOLE)) if (player != null) {
{
if(player != null)
{
plugin.getServer().getScheduler().runTaskLater(plugin,new waitConsoleCommand(sNewCommand.substring(1),
"[BetterAlias] "+ChatColor.AQUA+"Running console command for "+player.getName()+": "+sNewCommand), ac.waitTime);
}
else
{
plugin.getServer().getScheduler().runTaskLater(plugin, new waitConsoleCommand(sNewCommand.substring(1), plugin.getServer().getScheduler().runTaskLater(plugin, new waitConsoleCommand(sNewCommand.substring(1),
"[BetterAlias] "+ChatColor.AQUA+"Running: "+sNewCommand), ac.waitTime); "[BetterAlias] " + ChatColor.AQUA + "Running console command for " + player.getName() + ": " + sNewCommand), ac.waitTime);
} } else {
}
else if(ac.type.equals(AliasCommandTypes.WAIT))
{
if(player != null)
{
plugin.getServer().getScheduler().runTaskLater(plugin, new waitPlayerCommand(sNewCommand,player.getName()), ac.waitTime);
}
else
{
plugin.getServer().getScheduler().runTaskLater(plugin, new waitConsoleCommand(sNewCommand.substring(1), plugin.getServer().getScheduler().runTaskLater(plugin, new waitConsoleCommand(sNewCommand.substring(1),
"[BetterAlias] "+ChatColor.AQUA+"Running: "+sNewCommand), ac.waitTime); "[BetterAlias] " + ChatColor.AQUA + "Running: " + sNewCommand), ac.waitTime);
} }
} } else if (ac.type.equals(AliasCommandTypes.WAIT)) {
else if(ac.type.equals(AliasCommandTypes.PLAYER_AS_OP) && player != null) if (player != null) {
{ plugin.getServer().getScheduler().runTaskLater(plugin, new waitPlayerCommand(sNewCommand, player.getName()), ac.waitTime);
} else {
plugin.getServer().getScheduler().runTaskLater(plugin, new waitConsoleCommand(sNewCommand.substring(1),
"[BetterAlias] " + ChatColor.AQUA + "Running: " + sNewCommand), ac.waitTime);
}
} else if (ac.type.equals(AliasCommandTypes.PLAYER_AS_OP) && player != null) {
AliasManager.plugin.getLogger().log( AliasManager.plugin.getLogger().log(
Level.INFO, Level.INFO,
"[BetterAlias] {0}Running player_as_op command for {1}: {2}", "[BetterAlias] {0}Running player_as_op command for {1}: {2}",
new Object[] { ChatColor.AQUA, player.getName(), sNewCommand } new Object[]{ChatColor.AQUA, player.getName(), sNewCommand}
); );
if(player.isOp() == false) if (player.isOp() == false) {
{ try {
try
{
player.setOp(true); player.setOp(true);
AliasManager.plugin.getServer().dispatchCommand(player, sNewCommand.substring(1)); AliasManager.plugin.getServer().dispatchCommand(player, sNewCommand.substring(1));
} } catch (Exception e) {
catch(Exception e)
{
e.printStackTrace(); e.printStackTrace();
} } finally {
finally
{
player.setOp(false); player.setOp(false);
} }
} } else {
else
{
AliasManager.plugin.getServer().dispatchCommand(player, sNewCommand.substring(1)); AliasManager.plugin.getServer().dispatchCommand(player, sNewCommand.substring(1));
} }
} } else if (ac.type.equals(AliasCommandTypes.CONSOLE)
else if(ac.type.equals(AliasCommandTypes.CONSOLE) || player == null) {
|| player == null) if (player != null) {
{ plugin.getLogger().log(Level.INFO,
if(player != null)
{
plugin.getLogger().log(Level.INFO,
"[BetterAlias] {0}Running console command for {1}: {2}", "[BetterAlias] {0}Running console command for {1}: {2}",
new Object[]{ChatColor.AQUA, player.getName(), sNewCommand}); new Object[]{ChatColor.AQUA, player.getName(), sNewCommand});
} } else {
else cs.sendMessage("[BetterAlias] " + ChatColor.AQUA + "Running: " + sNewCommand);
{
cs.sendMessage("[BetterAlias] "+ChatColor.AQUA+"Running: "+sNewCommand);
} }
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), sNewCommand.substring(1)); plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), sNewCommand.substring(1));
} } else {
else
{
player.chat(sNewCommand); player.chat(sNewCommand);
} }
} }
return true; return true;
} }
return false; return false;
} }
public Alias getAliasMatch(String sCommand) public Collection<Alias> getAliasMatches(String sCommand) {
{ String sCommandLower = sCommand.toLowerCase()+" ";
String sCommandLower = sCommand.toLowerCase();
ArrayList<Alias> aliasMatches = new ArrayList<Alias>();
for(Alias alias : this.aliases.values())
{ for (Alias alias : this.aliases.values()) {
if(alias.caseSensitive) if (alias.caseSensitive) {
{ if (sCommand.startsWith(alias.command+" ")) {
if(sCommand.startsWith(alias.command)) aliasMatches.add(alias);
{
return alias;
}
}
else// Case insensitive
{
if(sCommandLower.startsWith(alias.command))
{
return alias;
} }
}
else if (sCommandLower.startsWith(alias.command+" ")) {
aliasMatches.add(alias);
} }
} }
return null; return aliasMatches;
} }
// Delayed tasks // Delayed tasks
private static class waitConsoleCommand implements Runnable private static class waitConsoleCommand implements Runnable {
{
private final String message; private final String message;
private final String command; private final String command;
public waitConsoleCommand(String command,String message) public waitConsoleCommand(String command, String message) {
{
this.message = message; this.message = message;
this.command = command; this.command = command;
} }
public void run() public void run() {
{
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command); plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command);
} }
} }
private static class waitPlayerCommand implements Runnable private static class waitPlayerCommand implements Runnable {
{
private final String playerName; private final String playerName;
private final String command; private final String command;
public waitPlayerCommand(String command,String playerName) public waitPlayerCommand(String command, String playerName) {
{
this.playerName = playerName; this.playerName = playerName;
this.command = command; this.command = command;
} }
public void run() public void run() {
{
Player p = plugin.getServer().getPlayer(playerName); Player p = plugin.getServer().getPlayer(playerName);
if(p != null) if (p != null) {
{
p.chat(command); p.chat(command);
} }
} }
} }
public void copy(InputStream in, File file) public void copy(InputStream in, File file) {
{ try {
try
{
OutputStream out = new FileOutputStream(file); OutputStream out = new FileOutputStream(file);
byte[] buf = new byte[1024]; byte[] buf = new byte[1024];
int len; int len;
while((len=in.read(buf))>0) while ((len = in.read(buf)) > 0) {
{ out.write(buf, 0, len);
out.write(buf,0,len);
} }
out.close(); out.close();
in.close(); in.close();
} catch (Exception e) } catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
} }
} }
private String replaceColorCodes(String str) private String replaceColorCodes(String str) {
{ for (ChatColor cc : ChatColor.values()) {
for(ChatColor cc : ChatColor.values()) str = str.replace("&" + cc.name(), cc.toString());
{
str = str.replace("&"+cc.name(), cc.toString());
} }
return str; return str;
} }
} }

42
com/ne0nx3r0/betteralias/command/BetterAliasCommandExecutor.java
View File

@ -6,43 +6,33 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class BetterAliasCommandExecutor implements CommandExecutor public class BetterAliasCommandExecutor implements CommandExecutor {
{
private final BetterAlias plugin; private final BetterAlias plugin;
public BetterAliasCommandExecutor(BetterAlias plugin) public BetterAliasCommandExecutor(BetterAlias plugin) {
{
this.plugin = plugin; this.plugin = plugin;
} }
public boolean onCommand(CommandSender cs, Command cmnd, String alias, String[] args) public boolean onCommand(CommandSender cs, Command cmnd, String alias, String[] args) {
{
// To allow nulling server commands out // To allow nulling server commands out
if(args.length == 1 && args[0].equalsIgnoreCase("donothing")) if (args.length == 1 && args[0].equalsIgnoreCase("donothing")) {
{
return true; return true;
} }
if(cs.hasPermission("BetterAlias.reload") || cs.isOp()) if (cs.hasPermission("BetterAlias.reload") || cs.isOp()) {
{
cs.sendMessage(ChatColor.GOLD + "Reloading aliases...");
cs.sendMessage(ChatColor.GOLD+"Reloading aliases...");
if (plugin.aliasManager.loadAliases()) {
if(plugin.aliasManager.loadAliases()) cs.sendMessage(ChatColor.GOLD + "Aliases reloaded!");
{ } else {
cs.sendMessage(ChatColor.GOLD+"Aliases reloaded!"); cs.sendMessage(ChatColor.RED + "An error occurred while reloading aliases!");
} }
else } else {
{ cs.sendMessage(ChatColor.RED + "You do not have permission to use /bareload (node: BetterAlias.reload)");
cs.sendMessage(ChatColor.RED+"An error occurred while reloading aliases!");
}
}
else
{
cs.sendMessage(ChatColor.RED+"You do not have permission to use /bareload (node: BetterAlias.reload)");
} }
return true; return true;
} }
} }

58
com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java
View File

@ -11,60 +11,48 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.server.ServerCommandEvent; import org.bukkit.event.server.ServerCommandEvent;
public class BetterAliasCommandListener implements Listener import java.util.Collection;
{ import java.util.List;
public class BetterAliasCommandListener implements Listener {
private final BetterAlias plugin; private final BetterAlias plugin;
public BetterAliasCommandListener(BetterAlias plugin) public BetterAliasCommandListener(BetterAlias plugin) {
{
this.plugin = plugin; this.plugin = plugin;
} }
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent e) public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent e) {
{
String sCommand = e.getMessage().substring(1); String sCommand = e.getMessage().substring(1);
Alias alias = plugin.aliasManager.getAliasMatch(sCommand); for(Alias alias : plugin.aliasManager.getAliasMatches(sCommand)){
if(alias != null)
{
String sArgs = sCommand.substring(alias.command.length()); String sArgs = sCommand.substring(alias.command.length());
Player player = e.getPlayer(); Player player = e.getPlayer();
String sNode = "betteralias."+alias.getPermissionNode(); String sNode = "betteralias." + alias.getPermissionNode();
if(alias.hasPermission() if (alias.hasPermission()
&& !player.hasPermission(sNode)) && !player.hasPermission(sNode)) {
{ player.sendMessage(ChatColor.RED + "You do not have permission to use this alias.");
player.sendMessage(ChatColor.RED+"You do not have permission to use this alias."); player.sendMessage(ChatColor.GRAY + "Node: " + sNode);
player.sendMessage(ChatColor.GRAY+"Node: "+sNode);
e.setCancelled(true); e.setCancelled(true);
} } else {
else if (plugin.aliasManager.sendAliasCommands(alias, (CommandSender) e.getPlayer(), sArgs)) {
{
if(plugin.aliasManager.sendAliasCommands(alias,(CommandSender) e.getPlayer(),sArgs))
{
e.setCancelled(true); e.setCancelled(true);
} }
} }
} }
} }
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onConsoleCommand(ServerCommandEvent e) public void onConsoleCommand(ServerCommandEvent e) {
{
String sCommand = e.getCommand(); String sCommand = e.getCommand();
Alias alias = plugin.aliasManager.getAliasMatch(sCommand); for(Alias alias : plugin.aliasManager.getAliasMatches(sCommand)){
if(alias != null)
{
String sArgs = sCommand.substring(alias.command.length()); String sArgs = sCommand.substring(alias.command.length());
if(plugin.aliasManager.sendAliasCommands(alias,e.getSender(),sArgs)) if (plugin.aliasManager.sendAliasCommands(alias, e.getSender(), sArgs)) {
{
e.setCommand("bareload donothing"); e.setCommand("bareload donothing");
} }
} }

2
plugin.yml
View File

@ -1,6 +1,6 @@
name: BetterAlias name: BetterAlias
main: com.ne0nx3r0.betteralias.BetterAlias main: com.ne0nx3r0.betteralias.BetterAlias
version: '1.4' version: '1.5.2'
database: false database: false
description: Command alias system description: Command alias system
commands: commands: