Redid existing disguise commands to make em prettier
This commit is contained in:
Andrew
@@ -26,7 +26,7 @@ public class DisguiseCommand implements CommandExecutor {
|
||||
if (sender.hasPermission("libsdisguises.disguise." + name))
|
||||
names.add(name);
|
||||
}
|
||||
Collections.sort(names);
|
||||
Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
|
||||
return names;
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ public class DisguiseCommand implements CommandExecutor {
|
||||
if (!sender.hasPermission("libsdisguises.disguise." + name))
|
||||
names.add(name);
|
||||
}
|
||||
Collections.sort(names);
|
||||
Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
|
||||
return names;
|
||||
}
|
||||
|
||||
@@ -52,96 +52,120 @@ public class DisguiseCommand implements CommandExecutor {
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
|
||||
Player p = (Player) sender;
|
||||
if (args.length == 0) {
|
||||
ArrayList<String> names = allowedDisguises(sender);
|
||||
ArrayList<String> otherNames = forbiddenDisguises(sender);
|
||||
if (names.size() > 0) {
|
||||
sender.sendMessage(ChatColor.RED + "You can use the disguises: " + ChatColor.GREEN
|
||||
+ StringUtils.join(names, ChatColor.RED + ", " + ChatColor.GREEN));
|
||||
if (otherNames.size() > 0) {
|
||||
sender.sendMessage(ChatColor.RED + "Other disguises: " + ChatColor.GREEN
|
||||
+ StringUtils.join(names, ChatColor.RED + ", " + ChatColor.GREEN));
|
||||
}
|
||||
} else
|
||||
sender.sendMessage(ChatColor.RED + "You do not have permission to use this command.");
|
||||
} else if (args[0].equalsIgnoreCase("undiguise") || args[0].equalsIgnoreCase("undis") || args[0].equalsIgnoreCase("un")) {
|
||||
if (sender.hasPermission("libsdisguises.undisguise")) {
|
||||
if (DisguiseAPI.isDisguised(p.getName())) {
|
||||
DisguiseAPI.undisguiseToAll(p);
|
||||
sender.sendMessage(ChatColor.RED + "You are no longer disguised");
|
||||
} else
|
||||
sender.sendMessage(ChatColor.RED + "You are not disguised!");
|
||||
} else
|
||||
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..");
|
||||
if (sender.getName().equals("CONSOLE")) {
|
||||
sender.sendMessage(ChatColor.RED + "You may not use this command from the console!");
|
||||
return true;
|
||||
}
|
||||
// What disguises can he use
|
||||
ArrayList<String> allowedDisguises = allowedDisguises(sender);
|
||||
// If he owns at least one disguise
|
||||
if (allowedDisguises.size() > 0) {
|
||||
// Get his forbidden disguises (Disguises he can't use) for later use
|
||||
ArrayList<String> forbiddenDisguises = forbiddenDisguises(sender);
|
||||
// If he is attempting to do something
|
||||
if (args.length > 0) {
|
||||
// If he owns the disguise
|
||||
if (allowedDisguises.contains(args[0].toLowerCase())) {
|
||||
Disguise disguise = null;
|
||||
// Time to start constructing the disguise.
|
||||
// We will need to check between all 3 kinds of disguises
|
||||
if (args[0].equalsIgnoreCase("player")) {// If he is doing a player disguise
|
||||
if (args.length == 1) {
|
||||
// He needs to give the player name
|
||||
sender.sendMessage(ChatColor.RED + "Error! You need to give a player name!");
|
||||
return true;
|
||||
}
|
||||
} else if (type.isMisc()) {
|
||||
if (isNumeric(args[1])) {
|
||||
args1 = Integer.parseInt(args[1]);
|
||||
} else {
|
||||
sender.sendMessage(ChatColor.RED + args[1] + " is not a number");
|
||||
return true;
|
||||
// Construct the player disguise
|
||||
disguise = new PlayerDisguise(ChatColor.translateAlternateColorCodes('&', args[1]));
|
||||
}
|
||||
if (args.length > 2)
|
||||
if (isNumeric(args[2])) {
|
||||
args2 = Integer.parseInt(args[2]);
|
||||
} else {
|
||||
sender.sendMessage(ChatColor.RED + args[2] + " is not a number");
|
||||
return true;
|
||||
} else {
|
||||
// Grab the disguise type so we know what constructor to use
|
||||
DisguiseType disguiseType = DisguiseType.valueOf(args[0].toUpperCase());
|
||||
if (disguiseType.isMob()) { // Its a mob, use the mob constructor
|
||||
boolean adult = 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;
|
||||
if (type.isMob())
|
||||
disguise = new MobDisguise(type, (Boolean) args1);
|
||||
else
|
||||
disguise = new MiscDisguise(type, (Integer) args1, args2);
|
||||
DisguiseAPI.disguiseToAll(p, disguise);
|
||||
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.");
|
||||
}
|
||||
} else {
|
||||
// Just send the disguises information.
|
||||
sendDisguises(sender, allowedDisguises, forbiddenDisguises);
|
||||
}
|
||||
} else
|
||||
sender.sendMessage(ChatColor.RED + "You are forbidden to use this command!");
|
||||
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, " ");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user