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

Add hex color support to translations

Browse Source
This commit is contained in:
libraryaddict
2020-06-27 21:01:58 +12:00
parent 5f2ac293bf
commit ffd6536565
70 changed files with 481 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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")) {
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
return true;
}
@@ -70,7 +70,8 @@ public class CopyDisguiseCommand implements CommandExecutor {
.addInteraction(sender.getName(), new CopyDisguiseInteraction(this),
DisguiseConfig.getDisguiseEntityExpire());
sender.sendMessage(LibsMsg.DISGUISECOPY_INTERACT.get(DisguiseConfig.getDisguiseEntityExpire()));
DisguiseUtilities
.sendMessage(sender, LibsMsg.DISGUISECOPY_INTERACT, DisguiseConfig.getDisguiseEntityExpire());
return true;
}

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

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

@@ -1,6 +1,7 @@
package me.libraryaddict.disguise.commands.utils;
import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.params.ParamInfo;
import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
import me.libraryaddict.disguise.utilities.parser.DisguiseParser;
@@ -47,14 +48,16 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
if (help != null) {
if (help.hasValues() && help.canTranslateValues()) {
sender.sendMessage(LibsMsg.DHELP_HELP4.get(help.getName(),
StringUtils.join(help.getEnums(""), LibsMsg.DHELP_HELP4_SEPERATOR.get())));
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP4, help.getName(),
StringUtils.join(help.getEnums(""), LibsMsg.DHELP_HELP4_SEPERATOR.get()));
} else {
if (!help.getName().equals(help.getDescriptiveName())) {
sender.sendMessage(LibsMsg.DHELP_HELP6
.get(help.getName(), help.getDescriptiveName(), help.getDescription()));
DisguiseUtilities
.sendMessage(sender, LibsMsg.DHELP_HELP6, help.getName(), help.getDescriptiveName(),
help.getDescription());
} else {
sender.sendMessage(LibsMsg.DHELP_HELP5.get(help.getName(), help.getDescription()));
DisguiseUtilities
.sendMessage(sender, LibsMsg.DHELP_HELP5, help.getName(), help.getDescription());
}
}
@@ -69,7 +72,7 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
}
if (!perms.isAllowedDisguise(type)) {
sender.sendMessage(LibsMsg.NO_PERM_DISGUISE.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM_DISGUISE);
return true;
}
@@ -115,14 +118,14 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
StringUtils.join(methods, ChatColor.DARK_RED + ", ")));
if (ignored > 0) {
sender.sendMessage(LibsMsg.NO_PERMS_USE_OPTIONS.get(ignored));
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERMS_USE_OPTIONS, ignored);
}
return true;
}
}
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
return true;
}
@@ -158,13 +161,13 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
*/
@Override
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
sender.sendMessage(LibsMsg.DHELP_HELP1.get());
sender.sendMessage(LibsMsg.DHELP_HELP2.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP1);
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP2);
for (ParamInfo s : ParamInfoManager.getParamInfos()) {
sender.sendMessage(LibsMsg.DHELP_HELP3.get(s.getName().replaceAll(" ", "") +
DisguiseUtilities.sendMessage(sender, LibsMsg.DHELP_HELP3, s.getName().replaceAll(" ", "") +
(!s.getName().equals(s.getDescriptiveName()) ? " ~ " + s.getDescriptiveName() : ""),
s.getDescription()));
s.getDescription());
}
}
}

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

@@ -1,6 +1,7 @@
package me.libraryaddict.disguise.commands.utils;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -15,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")) {
sender.sendMessage(LibsMsg.NO_CONSOLE.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
return true;
}
@@ -23,10 +24,10 @@ public class DisguiseViewSelfCommand implements CommandExecutor {
if (DisguiseAPI.isViewSelfToggled(player)) {
DisguiseAPI.setViewDisguiseToggled(player, false);
sender.sendMessage(LibsMsg.VIEW_SELF_OFF.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.VIEW_SELF_OFF);
} else {
DisguiseAPI.setViewDisguiseToggled(player, true);
sender.sendMessage(LibsMsg.VIEW_SELF_ON.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.VIEW_SELF_ON);
}
return true;

20
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")) {
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage(LibsMsg.NO_CONSOLE.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
return true;
}
@@ -61,7 +61,7 @@ public class GrabHeadCommand implements CommandExecutor {
private BukkitTask runnable = new BukkitRunnable() {
@Override
public void run() {
sender.sendMessage(LibsMsg.PLEASE_WAIT.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.PLEASE_WAIT);
}
}.runTaskTimer(LibsDisguises.getInstance(), 100, 100);
@@ -101,7 +101,7 @@ public class GrabHeadCommand implements CommandExecutor {
skull.setItemMeta(meta);
((Player) sender).getInventory().addItem(skull);
sender.sendMessage(LibsMsg.GRAB_HEAD_SUCCESS.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.GRAB_HEAD_SUCCESS);
}
}.runTask(LibsDisguises.getInstance());
}
@@ -113,11 +113,11 @@ public class GrabHeadCommand implements CommandExecutor {
}
private void sendHelp(CommandSender sender) {
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_1.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_2.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_3.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_4.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_5.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_6.get());
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);
}
}

20
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")) {
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
return true;
}
@@ -69,7 +69,7 @@ public class GrabSkinCommand implements CommandExecutor {
private BukkitTask runnable = new BukkitRunnable() {
@Override
public void run() {
sender.sendMessage(LibsMsg.PLEASE_WAIT.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.PLEASE_WAIT);
}
}.runTaskTimer(LibsDisguises.getInstance(), 100, 100);
@@ -107,7 +107,7 @@ public class GrabSkinCommand implements CommandExecutor {
}
DisguiseAPI.addGameProfile(nName, profile);
sender.sendMessage(LibsMsg.GRABBED_SKIN.get(nName));
DisguiseUtilities.sendMessage(sender, LibsMsg.GRABBED_SKIN, 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 {
sender.sendMessage(LibsMsg.SKIN_DATA.get(string));
DisguiseUtilities.sendMessage(sender, LibsMsg.SKIN_DATA, string);
}
DisguiseUtilities.setGrabSkinCommandUsed();
@@ -153,11 +153,11 @@ public class GrabSkinCommand implements CommandExecutor {
}
private void sendHelp(CommandSender sender) {
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_1.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_2.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_3.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_4.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_5.get());
sender.sendMessage(LibsMsg.GRAB_DISG_HELP_6.get());
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);
}
}

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