Upstream/BetterAlias
1
0
Fork 0
mirror of https://github.com/Ne0nx3r0/BetterAlias.git synced 2024-11-23 12:05:40 +01:00
Code Issues Projects Releases Wiki Activity

Adding wait times

Browse Source
This commit is contained in:
Ne0n x3r0 2013-04-09 19:49:06 -05:00
parent 404f460b4c
commit e221ccb7f3
5 changed files with 558 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
aliases.yml
View File

@ -30,6 +30,10 @@ hand:
handid:
0: /give !name !handItemID
# Toggle the current player's game mode from survival to creative
gm:
0: /gamemode !oppositeGameMode !name
# Send everything with a command
sendAll:
"*": /say !*
@ -70,4 +74,28 @@ makeop:
- console /op !1
- /me has opped !1
2: console /say testing single line
3: reply testing single line
3: reply testing single line
# Wait example
wait:
# Quotes are required because 0 uses a colon (:)
0:
- wait 80 /me thinks this message will come third
- wait 40 /me thinks this message will come second
- /me thinks this message will come first
# wait then reply example
waitreply:
# Quotes are required because 0 uses a colon (:)
0:
- wait 80 reply this came third!
- wait 40 reply this came second!
- reply this came first!
# Wait then console example
waitconsole:
# Quotes are required because 0 uses a colon (:)
0:
- wait 40 console /say this message was delayed!
- wait 80 console /say this message was delayed longer!
- console /say this message came first!

32
com/ne0nx3r0/betteralias/alias/AliasCommand.java
View File

@ -1,13 +1,19 @@
package com.ne0nx3r0.betteralias.alias;
public class AliasCommand
{
final String command;
final AliasCommandTypes type;
public AliasCommand(String command,AliasCommandTypes type)
{
this.command = command;
this.type = type;
}
}
package com.ne0nx3r0.betteralias.alias;
public class AliasCommand
{
final String command;
final AliasCommandTypes type;
int waitTime;
public AliasCommand(String command,AliasCommandTypes type,int waitTime)
{
this.command = command;
this.type = type;
if(waitTime > 0)
{
this.waitTime = waitTime;
}
}
}

23
com/ne0nx3r0/betteralias/alias/AliasCommandTypes.java
View File

@ -1,10 +1,13 @@
package com.ne0nx3r0.betteralias.alias;
public enum AliasCommandTypes
{
PLAYER,
CONSOLE,
REPLY_MESSAGE;
public int id;
}
package com.ne0nx3r0.betteralias.alias;
public enum AliasCommandTypes
{
PLAYER,
CONSOLE,
REPLY_MESSAGE,
WAIT,
WAIT_THEN_CONSOLE,
WAIT_THEN_REPLY;
public int id;
}

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

@ -1,348 +1,487 @@
package com.ne0nx3r0.betteralias.alias;
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.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
public class AliasManager
{
private final BetterAlias plugin;
private HashMap<String, Alias> aliases;
public AliasManager(BetterAlias plugin)
{
this.plugin = plugin;
this.loadAliases();
}
public final boolean loadAliases()
{
this.aliases = new HashMap<String,Alias>();
File configFile = new File(plugin.getDataFolder(), "aliases.yml");
if(!configFile.exists())
{
configFile.getParentFile().mkdirs();
copy(plugin.getResource("aliases.yml"), configFile);
}
FileConfiguration yml = YamlConfiguration.loadConfiguration(configFile);
Set<String> aliasList = yml.getKeys(false);
if(aliasList.isEmpty())
{
plugin.getLogger().log(Level.WARNING, "No aliases found in aliases.yml");
return false;
}
for(String sAlias : aliasList)
{
Alias alias;
if(yml.getString(sAlias+".permission") != null)
{
alias = new Alias(sAlias,yml.getString(sAlias+".permission"));
}
else
{
alias = new Alias(sAlias);
}
for(String sArg : yml.getConfigurationSection(sAlias).getKeys(false))
{
List<AliasCommand> commandsList = new ArrayList<AliasCommand>();
if(!sArg.equalsIgnoreCase("permission"))
{
int iArg;
if(sArg.equals("*"))
{
iArg = -1;
}
else
{
iArg = Integer.parseInt(sArg);
}
List<String> sArgLines = new ArrayList<String>();
if(yml.isList(sAlias+"."+sArg))
{
sArgLines = yml.getStringList(sAlias+"."+sArg);
}
else
{
sArgLines.add(yml.getString(sAlias+"."+sArg));
}
for(String sArgLine : sArgLines)
{
AliasCommandTypes type = AliasCommandTypes.PLAYER;
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("reply"))
{
type = AliasCommandTypes.REPLY_MESSAGE;
sArgLine = sArgLine.substring(sArgLine.indexOf(" ")+1);
}
}
sArgLine = this.replaceColorCodes(sArgLine);
commandsList.add(new AliasCommand(sArgLine,type));
}
alias.setCommandsFor(iArg,commandsList);
}
}
this.aliases.put(sAlias, alias);
}
return true;
}
public Alias getAlias(String sCommand)
{
return this.aliases.get(sCommand);
}
public boolean sendAliasCommands(Alias alias,CommandSender cs, String commandString)
{
Player player = null;
if(cs instanceof Player)
{
player = (Player) cs;
}
List<String> args = new ArrayList<String>();
Pattern regex = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'");
Matcher regexMatcher = regex.matcher(commandString);
while(regexMatcher.find())
{
if(regexMatcher.group(1) != null)
{
// Add double-quoted string without the quotes
args.add(regexMatcher.group(1));
}
else if (regexMatcher.group(2) != null)
{
// Add single-quoted string without the quotes
args.add(regexMatcher.group(2));
}
else
{
// Add unquoted word
args.add(regexMatcher.group());
}
}
if(alias.hasCommandFor(args.size()))
{
for(AliasCommand ac : alias.getCommands(args.size()))
{
String sAliasCommand = ac.command;
Matcher m = Pattern.compile("!([0-9a-zA-Z~*]+)").matcher(sAliasCommand);
StringBuffer sb = new StringBuffer(sAliasCommand.length());
while(m.find())
{
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("*"))
{
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";
for(Player p : plugin.getServer().getOnlinePlayers())
{
if(p.getName().toLowerCase().contains(sPlayerName))
{
text = p.getName();
break;
}
}
}
}
else
{
int iParam = -1;
try
{
iParam = Integer.parseInt(text);
}
catch(Exception ex){}
if(iParam > -1 && args.size() >= iParam)
{
text = args.get(iParam-1);
}
else
{
text = "";
}
}
m.appendReplacement(sb, Matcher.quoteReplacement(text));
}
m.appendTail(sb);
String sNewCommand = sb.toString();
if(ac.type.equals(AliasCommandTypes.REPLY_MESSAGE))
{
cs.sendMessage(sNewCommand);
}
else if(ac.type.equals(AliasCommandTypes.CONSOLE)
|| player == null)
{
if(player != null)
{
plugin.getLogger().log(Level.INFO,"[BetterAlias] "+ChatColor.AQUA+"Running console command for "+player.getName()+": "+sNewCommand);
}
else
{
cs.sendMessage("[BetterAlias] "+ChatColor.AQUA+"Running: "+sNewCommand);
}
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), sNewCommand.substring(1));
}
else
{
player.chat(sNewCommand);
}
}
return true;
}
return false;
}
// Helper method
public void copy(InputStream in, File file)
{
try
{
OutputStream out = new FileOutputStream(file);
byte[] buf = new byte[1024];
int len;
while((len=in.read(buf))>0)
{
out.write(buf,0,len);
}
out.close();
in.close();
} catch (Exception e)
{
e.printStackTrace();
}
}
private String replaceColorCodes(String str)
{
for(ChatColor cc : ChatColor.values())
{
str = str.replace("&"+cc.name(), cc.toString());
}
return str;
}
}
package com.ne0nx3r0.betteralias.alias;
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.GameMode;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
// Helper methods
public class AliasManager
{
private static BetterAlias plugin;
private HashMap<String, Alias> aliases;
public AliasManager(BetterAlias plugin)
{
AliasManager.plugin = plugin;
this.loadAliases();
}
public final boolean loadAliases()
{
this.aliases = new HashMap<String,Alias>();
File configFile = new File(plugin.getDataFolder(), "aliases.yml");
if(!configFile.exists())
{
configFile.getParentFile().mkdirs();
copy(plugin.getResource("aliases.yml"), configFile);
}
FileConfiguration yml = YamlConfiguration.loadConfiguration(configFile);
Set<String> aliasList = yml.getKeys(false);
if(aliasList.isEmpty())
{
plugin.getLogger().log(Level.WARNING, "No aliases found in aliases.yml");
return false;
}
for(String sAlias : aliasList)
{
Alias alias;
if(yml.getString(sAlias+".permission") != null)
{
alias = new Alias(sAlias,yml.getString(sAlias+".permission"));
}
else
{
alias = new Alias(sAlias);
}
for(String sArg : yml.getConfigurationSection(sAlias).getKeys(false))
{
List<AliasCommand> commandsList = new ArrayList<AliasCommand>();
if(!sArg.equalsIgnoreCase("permission"))
{
int iArg;
if(sArg.equals("*"))
{
iArg = -1;
}
else
{
iArg = Integer.parseInt(sArg);
}
List<String> sArgLines = new ArrayList<String>();
if(yml.isList(sAlias+"."+sArg))
{
sArgLines = yml.getStringList(sAlias+"."+sArg);
}
else
{
sArgLines.add(yml.getString(sAlias+"."+sArg));
}
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("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;
}
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);
}
}
this.aliases.put(sAlias, alias);
}
return true;
}
public Alias getAlias(String sCommand)
{
return this.aliases.get(sCommand);
}
public boolean sendAliasCommands(Alias alias,CommandSender cs, String commandString)
{
Player player = null;
if(cs instanceof Player)
{
player = (Player) cs;
}
List<String> args = new ArrayList<String>();
Pattern regex = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'");
Matcher regexMatcher = regex.matcher(commandString);
while(regexMatcher.find())
{
if(regexMatcher.group(1) != null)
{
// Add double-quoted string without the quotes
args.add(regexMatcher.group(1));
}
else if (regexMatcher.group(2) != null)
{
// Add single-quoted string without the quotes
args.add(regexMatcher.group(2));
}
else
{
// Add unquoted word
args.add(regexMatcher.group());
}
}
if(alias.hasCommandFor(args.size()))
{
for(AliasCommand ac : alias.getCommands(args.size()))
{
String sAliasCommand = ac.command;
Matcher m = Pattern.compile("!([0-9a-zA-Z~*]+)").matcher(sAliasCommand);
StringBuffer sb = new StringBuffer(sAliasCommand.length());
while(m.find())
{
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)
{
String sPlayerName = args.get(iParam-1).toLowerCase();
text = "BetterAliasPlayerNotFound";
for(Player p : plugin.getServer().getOnlinePlayers())
{
if(p.getName().toLowerCase().contains(sPlayerName))
{
text = p.getName();
break;
}
}
}
}
else
{
int iParam = -1;
try
{
iParam = Integer.parseInt(text);
}
catch(Exception ex){}
if(iParam > -1 && args.size() >= iParam)
{
text = args.get(iParam-1);
}
else
{
text = "";
}
}
m.appendReplacement(sb, Matcher.quoteReplacement(text));
}
m.appendTail(sb);
String sNewCommand = sb.toString();
if(ac.type.equals(AliasCommandTypes.REPLY_MESSAGE))
{
cs.sendMessage(sNewCommand);
}
else if(ac.type.equals(AliasCommandTypes.WAIT_THEN_REPLY))
{
final CommandSender csWait = cs;
final String message = sNewCommand;
plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable()
{
@Override
public void run()
{
csWait.sendMessage(message);
}
}, ac.waitTime);
}
else if(ac.type.equals(AliasCommandTypes.WAIT_THEN_CONSOLE))
{
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),
"[BetterAlias] "+ChatColor.AQUA+"Running: "+sNewCommand), ac.waitTime);
}
}
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),
"[BetterAlias] "+ChatColor.AQUA+"Running: "+sNewCommand), ac.waitTime);
}
}
else if(ac.type.equals(AliasCommandTypes.CONSOLE)
|| player == null)
{
if(player != null)
{
plugin.getLogger().log(Level.INFO,
"[BetterAlias] {0}Running console command for {1}: {2}",
new Object[]{ChatColor.AQUA, player.getName(), sNewCommand});
}
else
{
cs.sendMessage("[BetterAlias] "+ChatColor.AQUA+"Running: "+sNewCommand);
}
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), sNewCommand.substring(1));
}
else
{
player.chat(sNewCommand);
}
}
return true;
}
return false;
}
// Delayed tasks
private static class waitConsoleCommand implements Runnable
{
private final String message;
private final String command;
public waitConsoleCommand(String command,String message)
{
this.message = message;
this.command = command;
}
@Override
public void run()
{
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command);
}
}
private static class waitPlayerCommand implements Runnable
{
private final String playerName;
private final String command;
public waitPlayerCommand(String command,String playerName)
{
this.playerName = playerName;
this.command = command;
}
@Override
public void run()
{
Player p = plugin.getServer().getPlayer(playerName);
if(p != null)
{
p.chat(command);
}
}
}
public void copy(InputStream in, File file)
{
try
{
OutputStream out = new FileOutputStream(file);
byte[] buf = new byte[1024];
int len;
while((len=in.read(buf))>0)
{
out.write(buf,0,len);
}
out.close();
in.close();
} catch (Exception e)
{
e.printStackTrace();
}
}
private String replaceColorCodes(String str)
{
for(ChatColor cc : ChatColor.values())
{
str = str.replace("&"+cc.name(), cc.toString());
}
return str;
}
}

20
plugin.yml
View File

@ -1,11 +1,11 @@
name: BetterAlias
main: com.ne0nx3r0.betteralias.BetterAlias
version: '1.1.0'
database: false
description: Command alias system
commands:
bareload:
description: Reloads the aliases.yml file
permissions:
BetterAlias.reload:
name: BetterAlias
main: com.ne0nx3r0.betteralias.BetterAlias
version: '1.2'
database: false
description: Command alias system
commands:
bareload:
description: Reloads the aliases.yml file
permissions:
BetterAlias.reload:
description: Allows reloading BetterAlias