SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Redid existing disguise commands to make em prettier

Browse Source
This commit is contained in:
Andrew 2013-07-16 17:01:32 +12:00
parent dd02b4bcc2
commit 2c652db58b
4 changed files with 222 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/me/libraryaddict/disguise/Commands/DisguiseCommand.java
View File

@ -26,7 +26,7 @@ public class DisguiseCommand implements CommandExecutor {
if (sender.hasPermission("libsdisguises.disguise." + name)) if (sender.hasPermission("libsdisguises.disguise." + name))
names.add(name); names.add(name);
} }
Collections.sort(names); Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
return names; return names;
} }
@ -37,7 +37,7 @@ public class DisguiseCommand implements CommandExecutor {
if (!sender.hasPermission("libsdisguises.disguise." + name)) if (!sender.hasPermission("libsdisguises.disguise." + name))
names.add(name); names.add(name);
} }
Collections.sort(names); Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
return names; return names;
} }
@ -52,96 +52,120 @@ public class DisguiseCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
Player p = (Player) sender; if (sender.getName().equals("CONSOLE")) {
if (args.length == 0) { sender.sendMessage(ChatColor.RED + "You may not use this command from the console!");
ArrayList<String> names = allowedDisguises(sender); return true;
ArrayList<String> otherNames = forbiddenDisguises(sender); }
if (names.size() > 0) { // What disguises can he use
sender.sendMessage(ChatColor.RED + "You can use the disguises: " + ChatColor.GREEN ArrayList<String> allowedDisguises = allowedDisguises(sender);
+ StringUtils.join(names, ChatColor.RED + ", " + ChatColor.GREEN)); // If he owns at least one disguise
if (otherNames.size() > 0) { if (allowedDisguises.size() > 0) {
sender.sendMessage(ChatColor.RED + "Other disguises: " + ChatColor.GREEN // Get his forbidden disguises (Disguises he can't use) for later use
+ StringUtils.join(names, ChatColor.RED + ", " + ChatColor.GREEN)); ArrayList<String> forbiddenDisguises = forbiddenDisguises(sender);
} // If he is attempting to do something
} else if (args.length > 0) {
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command."); // If he owns the disguise
} else if (args[0].equalsIgnoreCase("undiguise") || args[0].equalsIgnoreCase("undis") || args[0].equalsIgnoreCase("un")) { if (allowedDisguises.contains(args[0].toLowerCase())) {
if (sender.hasPermission("libsdisguises.undisguise")) { Disguise disguise = null;
if (DisguiseAPI.isDisguised(p.getName())) { // Time to start constructing the disguise.
DisguiseAPI.undisguiseToAll(p); // We will need to check between all 3 kinds of disguises
sender.sendMessage(ChatColor.RED + "You are no longer disguised"); if (args[0].equalsIgnoreCase("player")) {// If he is doing a player disguise
} else if (args.length == 1) {
sender.sendMessage(ChatColor.RED + "You are not disguised!"); // He needs to give the player name
} else sender.sendMessage(ChatColor.RED + "Error! You need to give a player name!");
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command.");
} else if (args[0].equalsIgnoreCase("player")) {
if (sender.hasPermission("libsdisguises.disguise.player")) {
if (args.length > 1) {
String name = ChatColor.translateAlternateColorCodes('&',
StringUtils.join(args, " ").substring(args[0].length() + 1));
PlayerDisguise disguise = new PlayerDisguise(name);
DisguiseAPI.disguiseToAll(p, disguise);
sender.sendMessage(ChatColor.RED + "Now disguised as the player '" + ChatColor.GREEN + name + ChatColor.RESET
+ ChatColor.RED + "'");
} else
sender.sendMessage(ChatColor.RED + "You need to provide a player name");
} else {
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command");
}
} else {
if (allowedDisguises(sender).size() == 0) {
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command.");
return true;
}
DisguiseType type;
try {
type = DisguiseType.valueOf(args[0].toUpperCase());
} catch (Exception ex) {
sender.sendMessage(ChatColor.RED + "Failed to find disguise: " + ChatColor.GREEN + args[0]
+ "\n/disguise player <Name>\n/disguise <Mob Name>\n/disguise undisguise/un/undis\n/undisguise");
return true;
}
if (sender.hasPermission("libsdisguises.disguise." + type.name().toLowerCase())) {
Object args1 = true;
if (type.isMisc())
args1 = -1;
int args2 = -1;
if (args.length > 1) {
if (type.isMob()) {
if (args[1].equalsIgnoreCase("true")) {
args1 = false;
} else if (!args[1].equalsIgnoreCase("false")) {
sender.sendMessage(ChatColor.RED + "Set baby: " + ChatColor.GREEN + args[1] + ChatColor.RED
+ " - Thats not true or false..");
return true; return true;
}
} else if (type.isMisc()) {
if (isNumeric(args[1])) {
args1 = Integer.parseInt(args[1]);
} else { } else {
sender.sendMessage(ChatColor.RED + args[1] + " is not a number"); // Construct the player disguise
return true; disguise = new PlayerDisguise(ChatColor.translateAlternateColorCodes('&', args[1]));
} }
if (args.length > 2) } else {
if (isNumeric(args[2])) { // Grab the disguise type so we know what constructor to use
args2 = Integer.parseInt(args[2]); DisguiseType disguiseType = DisguiseType.valueOf(args[0].toUpperCase());
} else { if (disguiseType.isMob()) { // Its a mob, use the mob constructor
sender.sendMessage(ChatColor.RED + args[2] + " is not a number"); boolean adult = true;
return true; if (args.length > 1) {
// Seems they want to make this a baby disguise!
if (!args[1].equalsIgnoreCase("false") && !args[1].equalsIgnoreCase("true")) {
sender.sendMessage(ChatColor.RED + "Error! " + ChatColor.GREEN + args[1] + ChatColor.RED
+ " isn't true or false!");
return true;
}
adult = args[1].equalsIgnoreCase("false");
} }
disguise = new MobDisguise(disguiseType, adult);
} else if (disguiseType.isMisc()) {
// Its a misc, we are going to use the MiscDisguise constructor.
int miscId = -1;
int miscData = -1;
if (args.length > 1) {
// They have defined more arguements!
// If the first arg is a number
if (isNumeric(args[1])) {
miscId = Integer.parseInt(args[1]);
} else {
// Send them a error
sender.sendMessage(ChatColor.RED + "Error! " + ChatColor.GREEN + args[1] + ChatColor.RED
+ " is not a number!");
return true;
}
// If they also defined a data value
if (args.length > 2) {
if (isNumeric(args[1])) {
miscData = Integer.parseInt(args[2]);
} else {
// Send them a error
sender.sendMessage(ChatColor.RED + "Error! " + ChatColor.GREEN + args[2] + ChatColor.RED
+ " is not a number!");
return true;
}
}
}
// Construct the disguise
disguise = new MiscDisguise(disguiseType, true, miscId, miscData);
}
}
// Alright. We've constructed our disguise.
// Time to use it!
DisguiseAPI.disguiseToAll((Player) sender, disguise);
sender.sendMessage(ChatColor.RED + "Successfully disguised as a " + toReadable(disguise.getType().name())
+ "!");
} else {
// He doesn't. Either tell him its incorrect or he isn't allowed to use it
if (forbiddenDisguises.contains(args[0].toLowerCase())) {
// He isn't allowed to use it..
sender.sendMessage(ChatColor.RED + "You are forbidden to use this disguise!");
} else {
sender.sendMessage(ChatColor.RED + "Error! The disguise " + ChatColor.GREEN + args[0] + ChatColor.RED
+ " doesn't exist!");
} }
} }
Disguise disguise; } else {
if (type.isMob()) // Just send the disguises information.
disguise = new MobDisguise(type, (Boolean) args1); sendDisguises(sender, allowedDisguises, forbiddenDisguises);
else }
disguise = new MiscDisguise(type, (Integer) args1, args2); } else
DisguiseAPI.disguiseToAll(p, disguise); sender.sendMessage(ChatColor.RED + "You are forbidden to use this command!");
sender.sendMessage(ChatColor.RED + "Now disguised as a " + type.name().toLowerCase() + "!");
} else
sender.sendMessage(ChatColor.RED + "You do not have permission to use this disguise.");
}
return true; return true;
} }
/**
* Send the player the information
*/
private void sendDisguises(CommandSender sender, ArrayList<String> allowedDisguises, ArrayList<String> forbiddenDisguises) {
sender.sendMessage(ChatColor.DARK_GREEN + "Choose a disguise to become the disguise!");
sender.sendMessage(ChatColor.DARK_GREEN + "You can use the disguises: " + ChatColor.GREEN
+ StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN));
if (allowedDisguises.contains("player"))
sender.sendMessage(ChatColor.DARK_GREEN + "/disguise player <Name>");
sender.sendMessage(ChatColor.DARK_GREEN + "/disguise <DisguiseType> <Baby>");
if (allowedDisguises.contains("dropped_item") || allowedDisguises.contains("falling_block"))
sender.sendMessage(ChatColor.DARK_GREEN + "/disguiseplayer <Dropped_Item/Falling_Block> <Id> <Durability>");
}
private String toReadable(String name) {
String[] split = name.split("_");
for (int i = 0; i < split.length; i++)
split[i] = split[i].substring(0, 1) + split[i].substring(1).toLowerCase();
return StringUtils.join(split, " ");
}
} }

202
src/me/libraryaddict/disguise/Commands/DisguisePlayerCommand.java
View File

@ -24,10 +24,10 @@ public class DisguisePlayerCommand implements CommandExecutor {
ArrayList<String> names = new ArrayList<String>(); ArrayList<String> names = new ArrayList<String>();
for (DisguiseType type : DisguiseType.values()) { for (DisguiseType type : DisguiseType.values()) {
String name = type.name().toLowerCase(); String name = type.name().toLowerCase();
if (sender.hasPermission("libsdisguises.disguiseothers." + name)) if (sender.hasPermission("libsdisguises.disguiseentity." + name))
names.add(name); names.add(name);
} }
Collections.sort(names); Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
return names; return names;
} }
@ -35,10 +35,10 @@ public class DisguisePlayerCommand implements CommandExecutor {
ArrayList<String> names = new ArrayList<String>(); ArrayList<String> names = new ArrayList<String>();
for (DisguiseType type : DisguiseType.values()) { for (DisguiseType type : DisguiseType.values()) {
String name = type.name().toLowerCase(); String name = type.name().toLowerCase();
if (!sender.hasPermission("libsdisguises.disguiseothers." + name)) if (!sender.hasPermission("libsdisguises.disguiseentity." + name))
names.add(name); names.add(name);
} }
Collections.sort(names); Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
return names; return names;
} }
@ -53,114 +53,120 @@ public class DisguisePlayerCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (sender.hasPermission("libsdisguises.disguiseothers") // What disguises can he use
|| (args.length > 0 && args[0].toLowerCase().startsWith("un") && sender ArrayList<String> allowedDisguises = allowedDisguises(sender);
.hasPermission("libsdisguises.undisguiseothers"))) { // If he owns at least one disguise
if (args.length == 0) { if (allowedDisguises.size() > 0) {
ArrayList<String> names = allowedDisguises(sender); // Get his forbidden disguises (Disguises he can't use) for later use
ArrayList<String> otherNames = forbiddenDisguises(sender); ArrayList<String> forbiddenDisguises = forbiddenDisguises(sender);
if (names.size() > 0) { // If he is attempting to do something
sender.sendMessage(ChatColor.RED + "You can use the disguises: " + ChatColor.GREEN if (args.length > 0) {// Better go check that the player exists.
+ StringUtils.join(names, ChatColor.RED + ", " + ChatColor.GREEN)); Player player = Bukkit.getPlayer(args[0]);
if (otherNames.size() > 0) { if (player == null) {// Player doesn't exist. Knew it!
sender.sendMessage(ChatColor.RED + "Other disguises: " + ChatColor.GREEN sender.sendMessage(ChatColor.RED + "Error! Player " + ChatColor.GREEN + args[0] + ChatColor.RED
+ StringUtils.join(names, ChatColor.RED + ", " + ChatColor.GREEN)); + " doesn't exist!");
} return true;
} else }
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command.");
} else {
if (args.length > 1) { if (args.length > 1) {
Player p = Bukkit.getPlayer(args[0]); // If he owns the disguise
if (p != null) { if (allowedDisguises.contains(args[1].toLowerCase())) {
if (args[1].equalsIgnoreCase("undiguise") || args[1].equalsIgnoreCase("undis") // He can use the disguise huh.
|| args[1].equalsIgnoreCase("un")) { Disguise disguise = null;
if (sender.hasPermission("libsdisguises.undisguiseothers")) { // Time to start constructing the disguise.
if (DisguiseAPI.isDisguised(p.getName())) { // We will need to check between all 3 kinds of disguises
DisguiseAPI.undisguiseToAll(p); if (args[1].equalsIgnoreCase("player")) { // If he is doing a player disguise
sender.sendMessage(ChatColor.RED + "They are no longer disguised"); // Did he give enough args?
} else if (args.length == 2) {
sender.sendMessage(ChatColor.RED + "They are not disguised!"); // He needs to give the player name
} else sender.sendMessage(ChatColor.RED + "Error! You need to give a player name!");
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command."); return true;
} else if (args[1].equalsIgnoreCase("player")) {
if (sender.hasPermission("libsdisguises.disguiseothers.player")) {
if (args.length > 2) {
String name = ChatColor.translateAlternateColorCodes('&', StringUtils.join(args, " ")
.substring(args[0].length() + args[1].length() + 2));
PlayerDisguise disguise = new PlayerDisguise(name);
DisguiseAPI.disguiseToAll(p, disguise);
sender.sendMessage(ChatColor.RED + "Disguised " + p.getName() + " as the player '"
+ ChatColor.GREEN + name + ChatColor.RESET + ChatColor.RED + "'");
} else
sender.sendMessage(ChatColor.RED + "You need to provide a player name");
} else { } else {
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command"); // Construct the player disguise
disguise = new PlayerDisguise(ChatColor.translateAlternateColorCodes('&', args[2]));
} }
} else { } else {
if (allowedDisguises(sender).size() == 0) { // Grab the disguise type so we know what constructor to use
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command."); DisguiseType disguiseType = DisguiseType.valueOf(args[1].toUpperCase());
return true; if (disguiseType.isMob()) { // Its a mob, use the mob constructor
} boolean adult = true;
DisguiseType type;
try {
type = DisguiseType.valueOf(args[1].toUpperCase());
} catch (Exception ex) {
sender.sendMessage(ChatColor.RED
+ "Failed to find disguise: "
+ ChatColor.GREEN
+ args[1]
+ "\n/disguiseplayer <Name> player <Name>\n/disguiseplayer <Name><Mob Name>\n/disguiseplayer <Name> undisguise/un/undis\n/undisguiseplayer");
return true;
}
if (sender.hasPermission("libsdisguises.disguiseothers." + type.name().toLowerCase())) {
Object args1 = true;
if (type.isMisc())
args1 = -1;
int args2 = -1;
if (args.length > 2) { if (args.length > 2) {
if (type.isMob()) { // Seems they want to make this a baby disguise!
if (args[2].equalsIgnoreCase("true")) { if (!args[2].equalsIgnoreCase("false") && !args[2].equalsIgnoreCase("true")) {
args1 = false; sender.sendMessage(ChatColor.RED + "Error! " + ChatColor.GREEN + args[2] + ChatColor.RED
} else if (!args[2].equalsIgnoreCase("false")) { + " isn't true or false!");
sender.sendMessage(ChatColor.RED + "Set baby: " + ChatColor.GREEN + args[2] return true;
+ ChatColor.RED + " - Thats not true or false.."); }
return true; adult = args[1].equalsIgnoreCase("false");
} }
} else if (type.isMisc()) { disguise = new MobDisguise(disguiseType, adult);
if (isNumeric(args[2])) { } else if (disguiseType.isMisc()) {
args1 = Integer.parseInt(args[2]); // Its a misc, we are going to use the MiscDisguise constructor.
int miscId = -1;
int miscData = -1;
if (args.length > 2) {
// They have defined more arguements!
// If the first arg is a number
if (isNumeric(args[2])) {
miscId = Integer.parseInt(args[2]);
} else {
// Send them a error
sender.sendMessage(ChatColor.RED + "Error! " + ChatColor.GREEN + args[2] + ChatColor.RED
+ " is not a number!");
return true;
}
// If they also defined a data value
if (args.length > 3) {
if (isNumeric(args[3])) {
miscData = Integer.parseInt(args[3]);
} else { } else {
sender.sendMessage(ChatColor.RED + args[2] + " is not a number"); // Send them a error
sender.sendMessage(ChatColor.RED + "Error! " + ChatColor.GREEN + args[3]
+ ChatColor.RED + " is not a number!");
return true; return true;
} }
if (args.length > 3)
if (isNumeric(args[3])) {
args2 = Integer.parseInt(args[3]);
} else {
sender.sendMessage(ChatColor.RED + args[3] + " is not a number");
return true;
}
} }
} }
Disguise disguise; // Construct the disguise
if (type.isMob()) disguise = new MiscDisguise(disguiseType, true, miscId, miscData);
disguise = new MobDisguise(type, (Boolean) args1); }
else
disguise = new MiscDisguise(type, (Integer) args1, args2);
DisguiseAPI.disguiseToAll(p, disguise);
sender.sendMessage(ChatColor.RED + "Disguised " + p.getName() + " as a "
+ type.name().toLowerCase() + "!");
} else
sender.sendMessage(ChatColor.RED + "You do not have permission to use this disguise.");
} }
} else // Alright. We've constructed our disguise.
sender.sendMessage(ChatColor.RED + "Player not found"); // Time to use it!
DisguiseAPI.disguiseToAll(player, disguise);
sender.sendMessage(ChatColor.RED + "Successfully disguised " + player.getName() + "!");
} else {
// He doesn't. Either tell him its incorrect or he isn't allowed to use it
if (forbiddenDisguises.contains(args[0].toLowerCase())) {
// He isn't allowed to use it..
sender.sendMessage(ChatColor.RED + "You are forbidden to use this disguise!");
} else {
sender.sendMessage(ChatColor.RED + "Error! The disguise " + ChatColor.GREEN + args[0] + ChatColor.RED
+ " doesn't exist!");
}
}
} else } else
sender.sendMessage(ChatColor.RED + "/disguiseplayer <Name> <Disguise>"); sender.sendMessage(ChatColor.RED + "Error! You need to state a disguise!");
} else {
// Just send the disguises information.
sendDisguises(sender, allowedDisguises, forbiddenDisguises);
} }
} else } else
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command"); sender.sendMessage(ChatColor.RED + "You are forbidden to use this command!");
return true; return true;
} }
/**
* Send the player the information
*/
private void sendDisguises(CommandSender sender, ArrayList<String> allowedDisguises, ArrayList<String> forbiddenDisguises) {
sender.sendMessage(ChatColor.DARK_GREEN + "Disguise another player!");
sender.sendMessage(ChatColor.DARK_GREEN + "You can use the disguises: " + ChatColor.GREEN
+ StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN));
if (allowedDisguises.contains("player"))
sender.sendMessage(ChatColor.DARK_GREEN + "/disguiseplayer <PlayerName> player <Name>");
sender.sendMessage(ChatColor.DARK_GREEN + "/disguiseplayer <PlayerName> <DisguiseType> <Baby>");
if (allowedDisguises.contains("dropped_item") || allowedDisguises.contains("falling_block"))
sender.sendMessage(ChatColor.DARK_GREEN
+ "/disguiseplayer <PlayerName> <Dropped_Item/Falling_Block> <Id> <Durability>");
}
} }

11
src/me/libraryaddict/disguise/Commands/UndisguiseCommand.java
View File

@ -12,15 +12,18 @@ public class UndisguiseCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
Player p = (Player) sender; if (sender.getName().equals("CONSOLE")) {
sender.sendMessage(ChatColor.RED + "You may not use this command from the console!");
return true;
}
if (sender.hasPermission("libsdisguises.undisguise")) { if (sender.hasPermission("libsdisguises.undisguise")) {
if (DisguiseAPI.isDisguised(p.getName())) { if (DisguiseAPI.isDisguised(sender.getName())) {
DisguiseAPI.undisguiseToAll(p); DisguiseAPI.undisguiseToAll((Player) sender);
sender.sendMessage(ChatColor.RED + "You are no longer disguised"); sender.sendMessage(ChatColor.RED + "You are no longer disguised");
} else } else
sender.sendMessage(ChatColor.RED + "You are not disguised!"); sender.sendMessage(ChatColor.RED + "You are not disguised!");
} else } else
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command."); sender.sendMessage(ChatColor.RED + "You are forbidden to use this command!");
return true; return true;
} }
} }

2
src/me/libraryaddict/disguise/Commands/UndisguisePlayerCommand.java
View File

@ -27,7 +27,7 @@ public class UndisguisePlayerCommand implements CommandExecutor {
} else } else
sender.sendMessage(ChatColor.RED + "/undisguiseplayer <Name>"); sender.sendMessage(ChatColor.RED + "/undisguiseplayer <Name>");
} else } else
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command."); sender.sendMessage(ChatColor.RED + "You are forbidden to use this command!");
return true; return true;
} }
} }