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

9
src/main/java/me/libraryaddict/disguise/commands/utils/CopyDisguiseCommand.java
View File

@@ -38,7 +38,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
}
if (!sender.hasPermission("libsdisguises.copydisguise")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -58,7 +58,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
}
if (target == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.CANNOT_FIND_PLAYER, args[0]);
LibsMsg.CANNOT_FIND_PLAYER.send(sender, args[0]);
return true;
}
}
@@ -70,8 +70,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
.addInteraction(sender.getName(), new CopyDisguiseInteraction(this),
DisguiseConfig.getDisguiseEntityExpire());
DisguiseUtilities
.sendMessage(sender, LibsMsg.DISGUISECOPY_INTERACT, DisguiseConfig.getDisguiseEntityExpire());
LibsMsg.DISGUISECOPY_INTERACT.send(sender, DisguiseConfig.getDisguiseEntityExpire());
return true;
}
@@ -91,7 +90,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
public void sendMessage(CommandSender sender, LibsMsg msg, LibsMsg oldVer, String string, boolean forceAbbrev) {
if (!NmsVersion.v1_13.isSupported()) {
DisguiseUtilities.sendMessage(sender, oldVer, string);
oldVer.send(sender, string);
return;
}

14
src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseCloneCommand.java
View File

@@ -22,13 +22,13 @@ public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabComp
@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;
}
if (!sender.hasPermission("libsdisguises.disguise.disguiseclone")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -53,7 +53,7 @@ public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabComp
} else if (option.equalsIgnoreCase(LibsMsg.DCLONE_SPRINT.get())) {
doSprint = true;
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.INVALID_CLONE, option);
LibsMsg.INVALID_CLONE.send(sender, option);
return true;
}
}
@@ -67,7 +67,7 @@ public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabComp
.addInteraction(sender.getName(), new DisguiseCloneInteraction(options),
DisguiseConfig.getDisguiseCloneExpire());
DisguiseUtilities.sendMessage(sender, LibsMsg.CLICK_TIMER, DisguiseConfig.getDisguiseCloneExpire());
LibsMsg.CLICK_TIMER.send(sender, DisguiseConfig.getDisguiseCloneExpire());
}
return true;
@@ -103,8 +103,8 @@ public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabComp
*/
@Override
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
DisguiseUtilities.sendMessage(sender, LibsMsg.CLONE_HELP1);
DisguiseUtilities.sendMessage(sender, LibsMsg.CLONE_HELP2);
DisguiseUtilities.sendMessage(sender, LibsMsg.CLONE_HELP3);
LibsMsg.CLONE_HELP1.send(sender);
LibsMsg.CLONE_HELP2.send(sender);
LibsMsg.CLONE_HELP3.send(sender);
}
}

26
src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseHelpCommand.java
View File

@@ -48,16 +48,14 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
if (help != null) {
if (help.hasValues() && help.canTranslateValues()) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP4, help.getName(),
LibsMsg.DHELP_HELP4.send(sender, help.getName(),
StringUtils.join(help.getEnums(""), LibsMsg.DHELP_HELP4_SEPERATOR.get()));
} else {
if (!help.getName().equals(help.getDescriptiveName())) {
DisguiseUtilities
.sendMessage(sender, LibsMsg.DHELP_HELP6, help.getName(), help.getDescriptiveName(),
help.getDescription());
LibsMsg.DHELP_HELP6
.send(sender, help.getName(), help.getDescriptiveName(), help.getDescription());
} else {
DisguiseUtilities
.sendMessage(sender, LibsMsg.DHELP_HELP5, help.getName(), help.getDescription());
LibsMsg.DHELP_HELP5.send(sender, help.getName(), help.getDescription());
}
}
@@ -67,12 +65,12 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
DisguisePerm type = DisguiseParser.getDisguisePerm(args[0]);
if (type == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_CANTFIND, args[0]);
LibsMsg.DHELP_CANTFIND.send(sender, args[0]);
return true;
}
if (!perms.isAllowedDisguise(type)) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM_DISGUISE);
LibsMsg.NO_PERM_DISGUISE.send(sender);
return true;
}
@@ -114,18 +112,18 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
methods.add(LibsMsg.DHELP_NO_OPTIONS.get());
}
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_OPTIONS, ChatColor.DARK_RED + type.toReadable(),
LibsMsg.DHELP_OPTIONS.send(sender, ChatColor.DARK_RED + type.toReadable(),
StringUtils.join(methods, ChatColor.DARK_RED + ", "));
if (ignored > 0) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERMS_USE_OPTIONS, ignored);
LibsMsg.NO_PERMS_USE_OPTIONS.send(sender, ignored);
}
return true;
}
}
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -161,11 +159,11 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
*/
@Override
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP1);
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP2);
LibsMsg.DHELP_HELP1.send(sender);
LibsMsg.DHELP_HELP2.send(sender);
for (ParamInfo s : ParamInfoManager.getParamInfos()) {
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP3, s.getName().replaceAll(" ", "") +
LibsMsg.DHELP_HELP3.send(sender, s.getName().replaceAll(" ", "") +
(!s.getName().equals(s.getDescriptiveName()) ? " ~ " + s.getDescriptiveName() : ""),
s.getDescription());
}

6
src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseViewBarCommand.java
View File

@@ -15,7 +15,7 @@ public class DisguiseViewBarCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (sender.getName().equals("CONSOLE")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
@@ -23,10 +23,10 @@ public class DisguiseViewBarCommand implements CommandExecutor {
if (DisguiseAPI.isActionBarShown(player)) {
DisguiseAPI.setActionBarShown(player, false);
DisguiseUtilities.sendMessage(sender, LibsMsg.VIEW_BAR_OFF);
LibsMsg.VIEW_BAR_OFF.send(sender);
} else {
DisguiseAPI.setActionBarShown(player, true);
DisguiseUtilities.sendMessage(sender, LibsMsg.VIEW_BAR_ON);
LibsMsg.VIEW_BAR_ON.send(sender);
}
return true;

6
src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseViewSelfCommand.java
View File

@@ -16,7 +16,7 @@ public class DisguiseViewSelfCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (sender.getName().equals("CONSOLE")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
@@ -24,10 +24,10 @@ public class DisguiseViewSelfCommand implements CommandExecutor {
if (DisguiseAPI.isViewSelfToggled(player)) {
DisguiseAPI.setViewDisguiseToggled(player, false);
DisguiseUtilities.sendMessage(sender, LibsMsg.VIEW_SELF_OFF);
LibsMsg.VIEW_SELF_OFF.send(sender);
} else {
DisguiseAPI.setViewDisguiseToggled(player, true);
DisguiseUtilities.sendMessage(sender, LibsMsg.VIEW_SELF_ON);
LibsMsg.VIEW_SELF_ON.send(sender);
}
return true;

24
src/main/java/me/libraryaddict/disguise/commands/utils/GrabHeadCommand.java
View File

@@ -33,12 +33,12 @@ public class GrabHeadCommand implements CommandExecutor {
}
if (!sender.hasPermission("libsdisguises.grabhead")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
if (!(sender instanceof Player)) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
@@ -61,20 +61,20 @@ public class GrabHeadCommand implements CommandExecutor {
private BukkitTask runnable = new BukkitRunnable() {
@Override
public void run() {
DisguiseUtilities.sendMessage(sender, LibsMsg.PLEASE_WAIT);
LibsMsg.PLEASE_WAIT.send(sender);
}
}.runTaskTimer(LibsDisguises.getInstance(), 100, 100);
@Override
public void onError(LibsMsg msg, Object... args) {
DisguiseUtilities.sendMessage(sender, msg, args);
msg.send(sender, args);
runnable.cancel();
}
@Override
public void onInfo(LibsMsg msg, Object... args) {
DisguiseUtilities.sendMessage(sender, msg, args);
msg.send(sender, args);
}
@Override
@@ -101,7 +101,7 @@ public class GrabHeadCommand implements CommandExecutor {
skull.setItemMeta(meta);
((Player) sender).getInventory().addItem(skull);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_HEAD_SUCCESS);
LibsMsg.GRAB_HEAD_SUCCESS.send(sender);
}
}.runTask(LibsDisguises.getInstance());
}
@@ -113,11 +113,11 @@ public class GrabHeadCommand implements CommandExecutor {
}
private void sendHelp(CommandSender sender) {
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_1);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_2);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_3);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_4);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_5);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_6);
LibsMsg.GRAB_DISG_HELP_1.send(sender);
LibsMsg.GRAB_DISG_HELP_2.send(sender);
LibsMsg.GRAB_DISG_HELP_3.send(sender);
LibsMsg.GRAB_DISG_HELP_4.send(sender);
LibsMsg.GRAB_DISG_HELP_5.send(sender);
LibsMsg.GRAB_DISG_HELP_6.send(sender);
}
}

24
src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java
View File

@@ -35,7 +35,7 @@ public class GrabSkinCommand implements CommandExecutor {
}
if (!sender.hasPermission("libsdisguises.grabskin")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -69,20 +69,20 @@ public class GrabSkinCommand implements CommandExecutor {
private BukkitTask runnable = new BukkitRunnable() {
@Override
public void run() {
DisguiseUtilities.sendMessage(sender, LibsMsg.PLEASE_WAIT);
LibsMsg.PLEASE_WAIT.send(sender);
}
}.runTaskTimer(LibsDisguises.getInstance(), 100, 100);
@Override
public void onError(LibsMsg msg, Object... args) {
DisguiseUtilities.sendMessage(sender, msg, args);
msg.send(sender, args);
runnable.cancel();
}
@Override
public void onInfo(LibsMsg msg, Object... args) {
DisguiseUtilities.sendMessage(sender, msg, args);
msg.send(sender, args);
}
@Override
@@ -107,7 +107,7 @@ public class GrabSkinCommand implements CommandExecutor {
}
DisguiseAPI.addGameProfile(nName, profile);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRABBED_SKIN, nName);
LibsMsg.GRABBED_SKIN.send(sender, nName);
String string = DisguiseUtilities.getGson().toJson(profile);
int start = 0;
@@ -140,7 +140,7 @@ public class GrabSkinCommand implements CommandExecutor {
sender.spigot().sendMessage(builder.create());
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.SKIN_DATA, string);
LibsMsg.SKIN_DATA.send(sender, string);
}
DisguiseUtilities.setGrabSkinCommandUsed();
@@ -153,11 +153,11 @@ public class GrabSkinCommand implements CommandExecutor {
}
private void sendHelp(CommandSender sender) {
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_1);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_2);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_3);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_4);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_5);
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_DISG_HELP_6);
LibsMsg.GRAB_DISG_HELP_1.send(sender);
LibsMsg.GRAB_DISG_HELP_2.send(sender);
LibsMsg.GRAB_DISG_HELP_3.send(sender);
LibsMsg.GRAB_DISG_HELP_4.send(sender);
LibsMsg.GRAB_DISG_HELP_5.send(sender);
LibsMsg.GRAB_DISG_HELP_6.send(sender);
}
}

32
src/main/java/me/libraryaddict/disguise/commands/utils/SaveDisguiseCommand.java
View File

@@ -35,7 +35,7 @@ public class SaveDisguiseCommand implements CommandExecutor {
}
if (!sender.hasPermission("libsdisguises.savedisguise")) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
LibsMsg.NO_PERM.send(sender);
return true;
}
@@ -51,14 +51,14 @@ public class SaveDisguiseCommand implements CommandExecutor {
if (args.length == 0) {
if (!(sender instanceof Player)) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
LibsMsg.NO_CONSOLE.send(sender);
return true;
}
Disguise disguise = DisguiseAPI.getDisguise((Entity) sender);
if (disguise == null) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NOT_DISGUISED);
LibsMsg.NOT_DISGUISED.send(sender);
return true;
}
@@ -67,13 +67,13 @@ public class SaveDisguiseCommand implements CommandExecutor {
try {
DisguiseAPI.addCustomDisguise(name, disguiseString);
DisguiseUtilities.sendMessage(sender, LibsMsg.CUSTOM_DISGUISE_SAVED, name);
LibsMsg.CUSTOM_DISGUISE_SAVED.send(sender, name);
}
catch (DisguiseParseException e) {
if (e.getMessage() != null) {
DisguiseUtilities.sendMessage(sender, e.getMessage());
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.PARSE_CANT_LOAD);
LibsMsg.PARSE_CANT_LOAD.send(sender);
}
}
@@ -119,7 +119,7 @@ public class SaveDisguiseCommand implements CommandExecutor {
private BukkitTask runnable = new BukkitRunnable() {
@Override
public void run() {
DisguiseUtilities.sendMessage(sender, LibsMsg.PLEASE_WAIT);
LibsMsg.PLEASE_WAIT.send(sender);
}
}.runTaskTimer(LibsDisguises.getInstance(), 100, 100);
@@ -127,12 +127,12 @@ public class SaveDisguiseCommand implements CommandExecutor {
public void onError(LibsMsg msg, Object... args) {
runnable.cancel();
DisguiseUtilities.sendMessage(sender, msg, args);
msg.send(sender, args);
}
@Override
public void onInfo(LibsMsg msg, Object... args) {
DisguiseUtilities.sendMessage(sender, msg, args);
msg.send(sender, args);
}
@Override
@@ -163,7 +163,7 @@ public class SaveDisguiseCommand implements CommandExecutor {
try {
DisguiseAPI.addCustomDisguise(name, disguiseString);
DisguiseUtilities.sendMessage(sender, LibsMsg.CUSTOM_DISGUISE_SAVED, name);
LibsMsg.CUSTOM_DISGUISE_SAVED.send(sender, name);
DisguiseUtilities.setSaveDisguiseCommandUsed();
}
@@ -171,17 +171,17 @@ public class SaveDisguiseCommand implements CommandExecutor {
if (e.getMessage() != null) {
DisguiseUtilities.sendMessage(sender, e.getMessage());
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.PARSE_CANT_LOAD);
LibsMsg.PARSE_CANT_LOAD.send(sender);
}
}
}
private void sendHelp(CommandSender sender) {
DisguiseUtilities.sendMessage(sender, LibsMsg.SAVE_DISG_HELP_1);
DisguiseUtilities.sendMessage(sender, LibsMsg.SAVE_DISG_HELP_2);
DisguiseUtilities.sendMessage(sender, LibsMsg.SAVE_DISG_HELP_3);
DisguiseUtilities.sendMessage(sender, LibsMsg.SAVE_DISG_HELP_4);
DisguiseUtilities.sendMessage(sender, LibsMsg.SAVE_DISG_HELP_5);
DisguiseUtilities.sendMessage(sender, LibsMsg.SAVE_DISG_HELP_6);
LibsMsg.SAVE_DISG_HELP_1.send(sender);
LibsMsg.SAVE_DISG_HELP_2.send(sender);
LibsMsg.SAVE_DISG_HELP_3.send(sender);
LibsMsg.SAVE_DISG_HELP_4.send(sender);
LibsMsg.SAVE_DISG_HELP_5.send(sender);
LibsMsg.SAVE_DISG_HELP_6.send(sender);
}
}