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

Clean up send message again to use LibsMsg.send

Browse Source
This commit is contained in:
libraryaddict
2020-07-04 00:44:22 +12:00
parent b5b9b432f7
commit 8a59d64702
41 changed files with 270 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyCommand.java
View File

@@ -23,14 +23,14 @@ public class DisguiseModifyCommand extends DisguiseBaseCommand implements TabCom
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (!(sender instanceof Entity)) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
DisguisePermissions permissions = getPermissions(sender);
if (!permissions.hasPermissions()) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -42,14 +42,14 @@ public class DisguiseModifyCommand extends DisguiseBaseCommand implements TabCom
Disguise disguise = DisguiseAPI.getDisguise((Player) sender, (Entity) sender);
if (disguise == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NOT_DISGUISED);
LibsMsg.NOT_DISGUISED.send(sender);
return true;
}
DisguisePerm disguisePerm = new DisguisePerm(disguise.getType());
if (!permissions.isAllowedDisguise(disguisePerm)) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_NO_PERM);
LibsMsg.DMODIFY_NO_PERM.send(sender);
return true;
}
@@ -73,7 +73,7 @@ public class DisguiseModifyCommand extends DisguiseBaseCommand implements TabCom
return true;
}
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_MODIFIED);
LibsMsg.DMODIFY_MODIFIED.send(sender);
return true;
}
@@ -106,9 +106,9 @@ public class DisguiseModifyCommand extends DisguiseBaseCommand implements TabCom
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
ArrayList<String> allowedDisguises = getAllowedDisguises(permissions);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_HELP3);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_HELP3);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_HELP3,
LibsMsg.DMODIFY_HELP3.send(sender);
LibsMsg.DMODIFY_HELP3.send(sender);
LibsMsg.DMODIFY_HELP3.send(sender,
StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get()));
}
}

10
src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyEntityCommand.java
View File

@@ -22,14 +22,14 @@ public class DisguiseModifyEntityCommand extends DisguiseBaseCommand implements
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (!(sender instanceof Player)) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
DisguisePermissions permissions = getPermissions(sender);
if (!permissions.hasPermissions()) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -44,7 +44,7 @@ public class DisguiseModifyEntityCommand extends DisguiseBaseCommand implements
new DisguiseModifyInteraction(DisguiseUtilities.split(StringUtils.join(args, " "))),
DisguiseConfig.getDisguiseEntityExpire());
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFYENT_CLICK, DisguiseConfig.getDisguiseEntityExpire());
LibsMsg.DMODIFYENT_CLICK.send(sender, DisguiseConfig.getDisguiseEntityExpire());
return true;
}
@@ -78,8 +78,8 @@ public class DisguiseModifyEntityCommand extends DisguiseBaseCommand implements
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
ArrayList<String> allowedDisguises = getAllowedDisguises(permissions);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODENT_HELP1);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_HELP3,
LibsMsg.DMODENT_HELP1.send(sender);
LibsMsg.DMODIFY_HELP3.send(sender,
StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get()));
}
}

14
src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyPlayerCommand.java
View File

@@ -28,7 +28,7 @@ public class DisguiseModifyPlayerCommand extends DisguiseBaseCommand implements
DisguisePermissions permissions = getPermissions(sender);
if (!permissions.hasPermissions()) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -50,7 +50,7 @@ public class DisguiseModifyPlayerCommand extends DisguiseBaseCommand implements
}
if (entityTarget == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.CANNOT_FIND_PLAYER, args[0]);
LibsMsg.CANNOT_FIND_PLAYER.send(sender, args[0]);
return true;
}
@@ -71,14 +71,14 @@ public class DisguiseModifyPlayerCommand extends DisguiseBaseCommand implements
disguise = DisguiseAPI.getDisguise(entityTarget);
if (disguise == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODPLAYER_NODISGUISE, entityTarget.getName());
LibsMsg.DMODPLAYER_NODISGUISE.send(sender, entityTarget.getName());
return true;
}
DisguisePerm disguisePerm = new DisguisePerm(disguise.getType());
if (!permissions.isAllowedDisguise(disguisePerm)) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODPLAYER_NOPERM);
LibsMsg.DMODPLAYER_NOPERM.send(sender);
return true;
}
@@ -102,7 +102,7 @@ public class DisguiseModifyPlayerCommand extends DisguiseBaseCommand implements
return true;
}
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODPLAYER_MODIFIED, entityTarget.getName());
LibsMsg.DMODPLAYER_MODIFIED.send(sender, entityTarget.getName());
return true;
}
@@ -161,8 +161,8 @@ public class DisguiseModifyPlayerCommand extends DisguiseBaseCommand implements
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
ArrayList<String> allowedDisguises = getAllowedDisguises(permissions);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODPLAYER_HELP1);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_HELP3,
LibsMsg.DMODPLAYER_HELP1.send(sender);
LibsMsg.DMODIFY_HELP3.send(sender,
StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get()));
}
}

39
src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyRadiusCommand.java
View File

@@ -47,14 +47,14 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (sender.getName().equals("CONSOLE")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
DisguisePermissions permissions = getPermissions(sender);
if (!permissions.hasPermissions()) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -77,7 +77,7 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
Collections.sort(classes);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_USABLE,
LibsMsg.DMODRADIUS_USABLE.send(sender,
ChatColor.GREEN + StringUtils.join(classes, ChatColor.DARK_GREEN + ", " + ChatColor.GREEN));
return true;
}
@@ -99,29 +99,33 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
}
if (baseType == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_UNRECOGNIZED, args[0]);
LibsMsg.DMODRADIUS_UNRECOGNIZED.send(sender, args[0]);
return true;
}
}
if (args.length == starting + 1) {
DisguiseUtilities.sendMessage(sender,
starting == 0 ? LibsMsg.DMODRADIUS_NEEDOPTIONS : LibsMsg.DMODRADIUS_NEEDOPTIONS_ENTITY);
if (starting == 0) {
LibsMsg.DMODRADIUS_NEEDOPTIONS.send(sender);
} else {
LibsMsg.DMODRADIUS_NEEDOPTIONS_ENTITY.send(sender);
}
return true;
} else if (args.length < 2) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_NEEDOPTIONS);
LibsMsg.DMODRADIUS_NEEDOPTIONS.send(sender);
return true;
}
if (!isInteger(args[starting])) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NOT_NUMBER, args[starting]);
LibsMsg.NOT_NUMBER.send(sender, args[starting]);
return true;
}
int radius = Integer.parseInt(args[starting]);
if (radius > maxRadius) {
DisguiseUtilities.sendMessage(sender, LibsMsg.LIMITED_RADIUS, maxRadius);
LibsMsg.LIMITED_RADIUS.send(sender, maxRadius);
radius = maxRadius;
}
@@ -188,13 +192,13 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
}
if (noPermission > 0) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_NOPERM, noPermission);
LibsMsg.DMODRADIUS_NOPERM.send(sender, noPermission);
}
if (modifiedDisguises > 0) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS, modifiedDisguises);
LibsMsg.DMODRADIUS.send(sender, modifiedDisguises);
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_NOENTS);
LibsMsg.DMODRADIUS_NOENTS.send(sender);
}
return true;
@@ -245,7 +249,7 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
int radius = Integer.parseInt(args[starting]);
if (radius > maxRadius) {
DisguiseUtilities.sendMessage(sender, LibsMsg.LIMITED_RADIUS, maxRadius);
LibsMsg.LIMITED_RADIUS.send(sender, maxRadius);
radius = maxRadius;
}
@@ -287,11 +291,10 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
ArrayList<String> allowedDisguises = getAllowedDisguises(permissions);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_HELP1, maxRadius);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODIFY_HELP3,
StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get()));
LibsMsg.DMODRADIUS_HELP1.send(sender, maxRadius);
LibsMsg.DMODIFY_HELP3.send(sender, StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get()));
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_HELP2);
DisguiseUtilities.sendMessage(sender, LibsMsg.DMODRADIUS_HELP3);
LibsMsg.DMODRADIUS_HELP2.send(sender);
LibsMsg.DMODRADIUS_HELP3.send(sender);
}
}