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

Improve message sending

Browse Source
This commit is contained in:
libraryaddict
2020-07-03 17:36:29 +12:00
parent 3ced8ae9e4
commit e74df537bb
26 changed files with 109 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
}
if (target == null) {
sender.sendMessage(LibsMsg.CANNOT_FIND_PLAYER.get(args[0]));
DisguiseUtilities.sendMessage(sender, LibsMsg.CANNOT_FIND_PLAYER, args[0]);
return true;
}
}
@@ -91,7 +91,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
public void sendMessage(CommandSender sender, LibsMsg msg, LibsMsg oldVer, String string, boolean forceAbbrev) {
if (!NmsVersion.v1_13.isSupported()) {
sender.sendMessage(oldVer.get(string));
DisguiseUtilities.sendMessage(sender, oldVer, string);
return;
}

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

@@ -67,7 +67,7 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
DisguisePerm type = DisguiseParser.getDisguisePerm(args[0]);
if (type == null) {
sender.sendMessage(LibsMsg.DHELP_CANTFIND.get(args[0]));
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_CANTFIND, args[0]);
return true;
}
@@ -114,8 +114,8 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
methods.add(LibsMsg.DHELP_NO_OPTIONS.get());
}
sender.sendMessage(LibsMsg.DHELP_OPTIONS.get(ChatColor.DARK_RED + type.toReadable(),
StringUtils.join(methods, ChatColor.DARK_RED + ", ")));
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_OPTIONS, ChatColor.DARK_RED + type.toReadable(),
StringUtils.join(methods, ChatColor.DARK_RED + ", "));
if (ignored > 0) {
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERMS_USE_OPTIONS, ignored);

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

@@ -67,14 +67,14 @@ public class GrabHeadCommand implements CommandExecutor {
@Override
public void onError(LibsMsg msg, Object... args) {
sender.sendMessage(msg.get(args));
DisguiseUtilities.sendMessage(sender, msg, args);
runnable.cancel();
}
@Override
public void onInfo(LibsMsg msg, Object... args) {
sender.sendMessage(msg.get(args));
DisguiseUtilities.sendMessage(sender, msg, args);
}
@Override

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

@@ -75,14 +75,14 @@ public class GrabSkinCommand implements CommandExecutor {
@Override
public void onError(LibsMsg msg, Object... args) {
sender.sendMessage(msg.get(args));
DisguiseUtilities.sendMessage(sender, msg, args);
runnable.cancel();
}
@Override
public void onInfo(LibsMsg msg, Object... args) {
sender.sendMessage(msg.get(args));
DisguiseUtilities.sendMessage(sender, msg, args);
}
@Override

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

@@ -71,7 +71,7 @@ public class SaveDisguiseCommand implements CommandExecutor {
}
catch (DisguiseParseException e) {
if (e.getMessage() != null) {
sender.sendMessage(e.getMessage());
DisguiseUtilities.sendMessage(sender, e.getMessage());
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.PARSE_CANT_LOAD);
}
@@ -109,7 +109,7 @@ public class SaveDisguiseCommand implements CommandExecutor {
String usable = SkinUtils.getUsableStatus();
if (usable != null) {
sender.sendMessage(usable);
DisguiseUtilities.sendMessage(sender, usable);
return true;
}
@@ -127,12 +127,12 @@ public class SaveDisguiseCommand implements CommandExecutor {
public void onError(LibsMsg msg, Object... args) {
runnable.cancel();
sender.sendMessage(msg.get(args));
DisguiseUtilities.sendMessage(sender, msg, args);
}
@Override
public void onInfo(LibsMsg msg, Object... args) {
sender.sendMessage(msg.get(args));
DisguiseUtilities.sendMessage(sender, msg, args);
}
@Override
@@ -169,7 +169,7 @@ public class SaveDisguiseCommand implements CommandExecutor {
}
catch (DisguiseParseException e) {
if (e.getMessage() != null) {
sender.sendMessage(e.getMessage());
DisguiseUtilities.sendMessage(sender, e.getMessage());
} else {
DisguiseUtilities.sendMessage(sender, LibsMsg.PARSE_CANT_LOAD);
}