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

8
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguiseCommand.java
View File

@@ -22,19 +22,19 @@ public class UndisguiseCommand implements CommandExecutor {
}
if (sender.getName().equals("CONSOLE")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
if (sender.hasPermission("libsdisguises.undisguise") && !"%%__USER__%%".equals(12345 + "")) {
if (DisguiseAPI.isDisguised((Entity) sender)) {
DisguiseAPI.undisguiseToAll((Player) sender);
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISG);
LibsMsg.UNDISG.send(sender);
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.NOT_DISGUISED);
LibsMsg.NOT_DISGUISED.send(sender);
}
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
}
return true;

6
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguiseEntityCommand.java
View File

@@ -22,18 +22,18 @@ public class UndisguiseEntityCommand implements CommandExecutor {
}
if (sender.getName().equals("CONSOLE")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
if (!sender.hasPermission("libsdisguises.undisguiseentity")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
LibsDisguises.getInstance().getListener().addInteraction(sender.getName(), new UndisguiseEntityInteraction(),
DisguiseConfig.getDisguiseEntityExpire());
DisguiseUtilities.sendMessage(sender, LibsMsg.UND_ENTITY);
LibsMsg.UND_ENTITY.send(sender);
return true;
}

10
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguisePlayerCommand.java
View File

@@ -63,12 +63,12 @@ public class UndisguisePlayerCommand implements CommandExecutor, TabCompleter {
}
if (!sender.hasPermission("libsdisguises.undisguiseplayer")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
if (args.length == 0) {
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISG_PLAYER_HELP);
LibsMsg.UNDISG_PLAYER_HELP.send(sender);
return true;
}
@@ -85,17 +85,17 @@ public class UndisguisePlayerCommand implements CommandExecutor, TabCompleter {
}
if (entityTarget == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.CANNOT_FIND_PLAYER, args[0]);
LibsMsg.CANNOT_FIND_PLAYER.send(sender, args[0]);
return true;
}
if (DisguiseAPI.isDisguised(entityTarget)) {
DisguiseAPI.undisguiseToAll(entityTarget);
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISG_PLAYER,
LibsMsg.UNDISG_PLAYER.send(sender,
entityTarget instanceof Player ? entityTarget.getName() :
DisguiseType.getType(entityTarget).toReadable());
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISG_PLAYER_FAIL,
LibsMsg.UNDISG_PLAYER_FAIL.send(sender,
entityTarget instanceof Player ? entityTarget.getName() :
DisguiseType.getType(entityTarget).toReadable());
}

10
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguiseRadiusCommand.java
View File

@@ -37,7 +37,7 @@ public class UndisguiseRadiusCommand implements CommandExecutor {
}
if (sender.getName().equals("CONSOLE")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
@@ -45,12 +45,12 @@ public class UndisguiseRadiusCommand implements CommandExecutor {
int radius = maxRadius;
if (args.length > 0) {
if (!isNumeric(args[0])) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NOT_NUMBER, args[0]);
LibsMsg.NOT_NUMBER.send(sender, args[0]);
return true;
}
radius = Integer.parseInt(args[0]);
if (radius > maxRadius) {
DisguiseUtilities.sendMessage(sender, LibsMsg.LIMITED_RADIUS, maxRadius);
LibsMsg.LIMITED_RADIUS.send(sender, maxRadius);
radius = maxRadius;
}
}
@@ -66,9 +66,9 @@ public class UndisguiseRadiusCommand implements CommandExecutor {
}
}
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISRADIUS, disguisedEntitys);
LibsMsg.UNDISRADIUS.send(sender, disguisedEntitys);
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
}
return true;
}