From 245faf1803c80d529b9410cb5f7982a783184a19 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 20 Jun 2017 05:19:46 +1200 Subject: [PATCH] Fix up the last of the errors --- .../commands/DisguiseEntityCommand.java | 2 +- .../commands/DisguiseModifyEntityCommand.java | 2 +- .../commands/DisguiseModifyPlayerCommand.java | 2 +- .../commands/DisguiseModifyRadiusCommand.java | 4 +- .../commands/DisguisePlayerCommand.java | 2 +- .../commands/DisguiseRadiusCommand.java | 4 +- .../disguise/commands/UndisguiseCommand.java | 2 +- .../disguise/utilities/LibsMsg.java | 131 ++++++++---------- .../disguise/utilities/TranslateType.java | 1 - 9 files changed, 63 insertions(+), 87 deletions(-) diff --git a/src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java b/src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java index 716deefb..b06e0e6c 100644 --- a/src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java +++ b/src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java @@ -159,7 +159,7 @@ public class DisguiseEntityCommand extends DisguiseBaseCommand implements TabCom ArrayList allowedDisguises = getAllowedDisguises(map); sender.sendMessage(LibsMsg.DISG_ENT_HELP1.get()); - sender.sendMessage(LibsMsg.DISG_ENT_HELP2 + sender.sendMessage(LibsMsg.CAN_USE_DISGS .get(ChatColor.GREEN + StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN))); if (allowedDisguises.contains("player")) { diff --git a/src/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java b/src/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java index ab0dbfe8..d4cb0d43 100644 --- a/src/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java +++ b/src/me/libraryaddict/disguise/commands/DisguiseModifyEntityCommand.java @@ -109,7 +109,7 @@ public class DisguiseModifyEntityCommand extends DisguiseBaseCommand implements ArrayList allowedDisguises = getAllowedDisguises(map); sender.sendMessage(LibsMsg.DMODENT_HELP1.get()); - sender.sendMessage(LibsMsg.DMODENT_HELP2 + sender.sendMessage(LibsMsg.DMODIFY_HELP3 .get(ChatColor.GREEN + StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN))); } } diff --git a/src/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java b/src/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java index cb81322d..86332a17 100644 --- a/src/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java +++ b/src/me/libraryaddict/disguise/commands/DisguiseModifyPlayerCommand.java @@ -189,7 +189,7 @@ public class DisguiseModifyPlayerCommand extends DisguiseBaseCommand implements ArrayList allowedDisguises = getAllowedDisguises(map); sender.sendMessage(LibsMsg.DMODPLAYER_HELP1.get()); - sender.sendMessage(LibsMsg.DMODPLAYER_HELP2 + sender.sendMessage(LibsMsg.DMODIFY_HELP3 .get(ChatColor.GREEN + StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN))); } } diff --git a/src/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java b/src/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java index 33e8d88a..6cc2462e 100644 --- a/src/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java +++ b/src/me/libraryaddict/disguise/commands/DisguiseModifyRadiusCommand.java @@ -297,13 +297,13 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements ArrayList allowedDisguises = getAllowedDisguises(map); sender.sendMessage(LibsMsg.DMODRADIUS_HELP1.get(maxRadius)); - sender.sendMessage(LibsMsg.DMODRADIUS_HELP2 + sender.sendMessage(LibsMsg.DMODIFY_HELP3 .get(ChatColor.GREEN + StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN))); String optional = ChatColor.DARK_GREEN + "(" + ChatColor.GREEN + "Optional" + ChatColor.DARK_GREEN + ")"; if (allowedDisguises.contains("player")) { - sender.sendMessage(LibsMsg.DMODRADIUS_HELP3.get()); + sender.sendMessage(LibsMsg.DRADIUS_HELP3.get()); } sender.sendMessage(LibsMsg.DMODRADIUS_HELP4.get()); diff --git a/src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java b/src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java index 15e8628e..cf6cc0df 100644 --- a/src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java +++ b/src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java @@ -190,7 +190,7 @@ public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCom ArrayList allowedDisguises = getAllowedDisguises(map); sender.sendMessage(LibsMsg.D_HELP1.get()); - sender.sendMessage(LibsMsg.D_HELP2 + sender.sendMessage(LibsMsg.CAN_USE_DISGS .get(ChatColor.GREEN + StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN))); if (allowedDisguises.contains("player")) { diff --git a/src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java b/src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java index 6730c124..1225f998 100644 --- a/src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java +++ b/src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java @@ -92,7 +92,7 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom } if (type == null) { - sender.sendMessage(LibsMsg.DRADIUS_UNRECOG.get(args[0])); + sender.sendMessage(LibsMsg.DMODRADIUS_UNRECOGNIZED.get(args[0])); return true; } } @@ -305,7 +305,7 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom ArrayList allowedDisguises = getAllowedDisguises(map); sender.sendMessage(LibsMsg.DRADIUS_HELP1.get(maxRadius)); - sender.sendMessage(LibsMsg.DRADIUS_HELP2 + sender.sendMessage(LibsMsg.CAN_USE_DISGS .get(ChatColor.GREEN + StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN))); if (allowedDisguises.contains("player")) { diff --git a/src/me/libraryaddict/disguise/commands/UndisguiseCommand.java b/src/me/libraryaddict/disguise/commands/UndisguiseCommand.java index 10d27d33..62d000f9 100644 --- a/src/me/libraryaddict/disguise/commands/UndisguiseCommand.java +++ b/src/me/libraryaddict/disguise/commands/UndisguiseCommand.java @@ -24,7 +24,7 @@ public class UndisguiseCommand implements CommandExecutor { DisguiseAPI.undisguiseToAll((Player) sender); sender.sendMessage(LibsMsg.UNDISG.get()); } else { - sender.sendMessage(LibsMsg.UNDISG_FAIL.get()); + sender.sendMessage(LibsMsg.NOT_DISGUISED.get()); } } else { sender.sendMessage(LibsMsg.NO_PERM.get()); diff --git a/src/me/libraryaddict/disguise/utilities/LibsMsg.java b/src/me/libraryaddict/disguise/utilities/LibsMsg.java index 512099fc..35b21397 100644 --- a/src/me/libraryaddict/disguise/utilities/LibsMsg.java +++ b/src/me/libraryaddict/disguise/utilities/LibsMsg.java @@ -11,70 +11,66 @@ import java.util.ArrayList; public enum LibsMsg { // Format being CLASS_STRING. So no perm = DISG_COMMAND_NO_PERM. Or DISG_PARSE_NO_PERM_OPTION DHELP_OPTIONS("%s options: %s"), NO_PERMS_USE_OPTIONS( - ChatColor.RED + "Ignored %s" + " options you do not have " + "permission to use. Add " + "'show' to view unusable options."), - DISG_HELP4(ChatColor.DARK_GREEN + "/disguise " + " "), + ChatColor.RED + "Ignored %s options you do not have permission to use. Add 'show' to view unusable options."), + DISG_HELP4(ChatColor.DARK_GREEN + "/disguise "), DHELP_CANTFIND(ChatColor.RED + "Cannot find the disguise %s"), - NO_PERM_DISGUISE(ChatColor.RED + "You do not have permission for " + "that disguise!"), + NO_PERM_DISGUISE(ChatColor.RED + "You do not have permission for that disguise!"), DISG_ENT_HELP1(ChatColor.DARK_GREEN + "Choose a disguise then right click an entity to disguise it!"), - DISG_ENT_HELP2(ChatColor.DARK_GREEN + "You can use the " + "disguises: %s"), DISG_ENT_HELP3(ChatColor.DARK_GREEN + "/disguiseentity player "), DISG_ENT_HELP4(ChatColor.DARK_GREEN + "/disguiseentity "), - DISG_ENT_HELP5(ChatColor.DARK_GREEN + "/disguiseentity " + ""), + DISG_ENT_HELP5(ChatColor.DARK_GREEN + "/disguiseentity "), DISG_ENT_CLICK(ChatColor.RED + "Right click an entity in the next %s seconds to disguise it as a %s!"), - DISG_HELP3(ChatColor.DARK_GREEN + "/disguise " + ""), - DMODRADIUS(ChatColor.RED + "Successfully modified the disguises of %s" + " entities!"), + DISG_HELP3(ChatColor.DARK_GREEN + "/disguise "), + DMODRADIUS(ChatColor.RED + "Successfully modified the disguises of %s entities!"), DMODRADIUS_NOENTS(ChatColor.RED + "Couldn't find any disguised entities!"), - DMODRADIUS_NOPERM(ChatColor.RED + "No " + "permission to modify " + "%s disguises!"), - DISG_HELP2(ChatColor.DARK_GREEN + "/disguise player " + ""), + DMODRADIUS_NOPERM(ChatColor.RED + "No permission to modify %s disguises!"), + DISG_HELP2(ChatColor.DARK_GREEN + "/disguise player "), DISG_HELP1(ChatColor.DARK_GREEN + "Choose a disguise to become the disguise!"), CAN_USE_DISGS(ChatColor.DARK_GREEN + "You can use the disguises: %s"), - DISGUISED(ChatColor.RED + "Now " + "disguised as a %s"), + DISGUISED(ChatColor.RED + "Now disguised as a %s"), DHELP_HELP2(ChatColor.RED + "/disguisehelp %s" + ChatColor.GREEN + " - %s"), DHELP_HELP1( - ChatColor.RED + "/disguisehelp " + " " + ChatColor.GREEN + "- View the options you can set " + "on a disguise. Add 'show' to reveal the options you don't have permission to use"), + ChatColor.RED + "/disguisehelp " + ChatColor.GREEN + "- View the options you can set on a disguise. Add 'show' to reveal the options you don't have permission to use"), FAILED_DISGIUSE(ChatColor.RED + "Failed to disguise as a %s"), CLONE_HELP1( - ChatColor.DARK_GREEN + "Right click a entity to get a disguise reference you can pass to other " + "disguise commands!"), + ChatColor.DARK_GREEN + "Right click a entity to get a disguise reference you can pass to other disguise commands!"), CLONE_HELP2( - ChatColor.DARK_GREEN + "Security note: Any references you create will be available to all players " + "able to use disguise references."), + ChatColor.DARK_GREEN + "Security note: Any references you create will be available to all players able to use disguise references."), CLONE_HELP3( ChatColor.DARK_GREEN + "/disguiseclone IgnoreEquipment" + ChatColor.DARK_GREEN + "(" + ChatColor.GREEN + "Optional" + ChatColor.DARK_GREEN + ")"), RELOADED_CONFIG(ChatColor.GREEN + "[LibsDisguises] Reloaded config."), - DMODIFY_NO_PERM(ChatColor.RED + "No " + "permission to modify your disguise!"), + DMODIFY_NO_PERM(ChatColor.RED + "No permission to modify your disguise!"), DMODIFY_MODIFIED(ChatColor.RED + "Your disguise has been modified!"), - DMODIFY_HELP1(ChatColor.DARK_GREEN + "Modify your own disguise as you wear " + "it!"), + DMODIFY_HELP1(ChatColor.DARK_GREEN + "Modify your own disguise as you wear it!"), DMODIFY_HELP2(ChatColor.DARK_GREEN + "/disguisemodify setBaby true setSprinting true"), - DMODIFY_HELP3(ChatColor.DARK_GREEN + "You can modify the " + "disguises: %s"), DMODIFYENT_CLICK( - ChatColor.RED + "Right click a disguised entity " + "in the next %s seconds to modify their disguise!"), + DMODIFY_HELP3(ChatColor.DARK_GREEN + "You can modify the disguises: %s"), + DMODIFYENT_CLICK(ChatColor.RED + "Right click a disguised entity in the next %s seconds to modify their disguise!"), LIBS_RELOAD_WRONG(ChatColor.RED + "[LibsDisguises] Did you mean 'reload'?"), DMODENT_HELP1(ChatColor.DARK_GREEN + "Choose the options for a disguise then right click a entity to modify it!"), - DMODENT_HELP2(ChatColor.DARK_GREEN + "You can modify the " + "disguises: %s"), - CANNOT_FIND_PLAYER(ChatColor.RED + "Cannot find the player '%s" + "'"), - PARSE_USE_SECOND_NUM(ChatColor.RED + "Error! Only the disguises %s" + " and %s" + " uses a second number!"), + CANNOT_FIND_PLAYER(ChatColor.RED + "Cannot find the player '%s'"), + PARSE_USE_SECOND_NUM(ChatColor.RED + "Error! Only the disguises %s and %s uses a second number!"), PARSE_NO_PERM_PARAM( - ChatColor.RED + "Error! You do not have permission to use the parameter %s on the" + " %s " + "disguise!"), + ChatColor.RED + "Error! You do not have permission to use the parameter %s on the %s disguise!"), PARSE_NO_OPTION_VALUE(ChatColor.RED + "No value was given for the option %s"), PARSE_OPTION_NA(ChatColor.RED + "Cannot find the option %s"), UPDATE_READY( ChatColor.RED + "[LibsDisguises] " + ChatColor.DARK_RED + "There is a update ready to be downloaded! You are using " + ChatColor.RED + "v%s" + ChatColor.DARK_RED + ", the new version is " + ChatColor.RED + "%s" + ChatColor.DARK_RED + "!"), PARSE_EXPECTED_RECEIVED( ChatColor.RED + "Expected " + ChatColor.GREEN + "%s" + ChatColor.RED + ", received " + ChatColor.GREEN + "%s" + ChatColor.RED + " instead for " + ChatColor.GREEN + "%s"), DRADIUS_ENTITIES(ChatColor.DARK_GREEN + "EntityTypes usable are: %s"), - DRADIUS_UNRECOG(ChatColor.RED + "Unrecognised " + "EntityType %s"), - PARSE_TOO_MANY_ARGS(ChatColor.RED + "Error! %s doesn't know" + " " + "what to do with %s!"), + PARSE_TOO_MANY_ARGS(ChatColor.RED + "Error! %s doesn't know what to do with %s!"), DISG_PLAYER_AS_DISG(ChatColor.RED + "Successfully disguised %s as a %s!"), PARSE_NO_PERM_NAME(ChatColor.RED + "Error! You don't have permission to use that name!"), - DPLAYER_SUPPLY(ChatColor.RED + "You need to supply a disguise as well as " + "the player"), - PARSE_SUPPLY_PLAYER(ChatColor.RED + "Error! You need " + "to give a player name!"), + DPLAYER_SUPPLY(ChatColor.RED + "You need to supply a disguise as well as the player"), + PARSE_SUPPLY_PLAYER(ChatColor.RED + "Error! You need to give a player name!"), DISG_PLAYER_AS_DISG_FAIL(ChatColor.RED + "Failed to disguise %s as a %s!"), DISABLED_LIVING_TO_MISC( - ChatColor.RED + "Can't disguise a living entity as a misc disguise. This has been disabled in the" + " config!"), - DMODRADIUS_HELP1(ChatColor.DARK_GREEN + "Modify the disguises in a radius! Caps at %s blocks!"), - DMODRADIUS_HELP2(ChatColor.DARK_GREEN + "You can modify the disguises: %s"), DMODRADIUS_HELP3( - (ChatColor.DARK_GREEN + "/disguiseradius player ") + ChatColor.RED + "Can't disguise a living entity as a misc disguise. This has been disabled in the config!"), + DMODRADIUS_HELP1(ChatColor.DARK_GREEN + "Modify the disguises in a radius! Caps at %s blocks!"), DMODRADIUS_HELP3( + (ChatColor.DARK_GREEN + "/disguisemodifyradius player ") .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DMODRADIUS_HELP4( - (ChatColor.DARK_GREEN + "/disguiseradius ") + (ChatColor.DARK_GREEN + "/disguisemodifyradius ") .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DMODRADIUS_HELP5( - (ChatColor.DARK_GREEN + "/disguiseradius ") + (ChatColor.DARK_GREEN + "/disguisemodifyradius ") .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DMODRADIUS_HELP6( - ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguiseradius " + "EntityTypes"), - UND_ENTITY(ChatColor.RED + "Right click a disguised entity to " + "undisguise them!"), + ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguisemodifyradius EntityTypes"), + UND_ENTITY(ChatColor.RED + "Right click a disguised entity to undisguise them!"), UNDISG_PLAYER(ChatColor.RED + "%s is no longer disguised"), LISTEN_ENTITY_PLAYER_DISG_PLAYER(ChatColor.RED + "Disguised the player %s as the player %s!"), LISTEN_ENTITY_PLAYER_DISG_ENTITY(ChatColor.RED + "Disguised the player %s as a %s!"), @@ -88,74 +84,55 @@ public enum LibsMsg { LISTEN_UNDISG_PLAYER_FAIL(ChatColor.RED + "The %s isn't disguised!"), MADE_REF(ChatColor.RED + "Constructed a %s disguise! Your reference is %s"), MADE_REF_EXAMPLE(ChatColor.RED + "Example usage: /disguise %s"), REF_TOO_MANY( - ChatColor.RED + "Failed to store the reference, too many cloned disguises. Please raise the " + "maximum " + "cloned disguises, or lower the time they last"), + ChatColor.RED + "Failed to store the reference, too many cloned disguises. Please raise the maximum cloned disguises, or lower the time they last"), LISTEN_UNDISG_ENT_FAIL(ChatColor.RED + "%s isn't disguised!"), UNDISG_PLAYER_FAIL(ChatColor.RED + "%s not disguised!"), UNDISG_PLAYER_HELP(ChatColor.RED + "/undisguiseplayer "), - DMODPLAYER_NODISGUISE(ChatColor.RED + "The " + "player '%s' is " + "not disguised"), - DMODPLAYER_NOPERM(ChatColor.RED + "You do not have permission to modify this " + "disguise"), + DMODPLAYER_NODISGUISE(ChatColor.RED + "The player '%s' is not disguised"), + DMODPLAYER_NOPERM(ChatColor.RED + "You do not have permission to modify this disguise"), DMODPLAYER_MODIFIED(ChatColor.RED + "Modified the disguise of %s!"), LISTENER_MODIFIED_DISG(ChatColor.RED + "Modified the disguise!"), DMODPLAYER_HELP1(ChatColor.DARK_GREEN + "Modify the disguise of another player!"), - DMODPLAYER_HELP2(ChatColor.DARK_GREEN + "You can modify the " + "disguises: %s"), NO_PERM(ChatColor.RED + "You are forbidden to use this command."), NOT_DISGUISED(ChatColor.RED + "You are not disguised!"), - DRADIUS_HELP1(ChatColor.DARK_GREEN + "Disguise all entities in a radius! Caps at %s blocks!"), - DRADIUS_HELP2(ChatColor.DARK_GREEN + "You can use the " + "disguises: %s"), DRADIUS_HELP3( - (ChatColor.DARK_GREEN + "/disguiseradius player ") + DRADIUS_HELP1(ChatColor.DARK_GREEN + "Disguise all entities in a radius! Caps at %s blocks!"), DRADIUS_HELP3( + (ChatColor.DARK_GREEN + "/disguiseradius player ") .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DRADIUS_HELP4( - (ChatColor.DARK_GREEN + "/disguiseradius ") + (ChatColor.DARK_GREEN + "/disguiseradius ") .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DRADIUS_HELP5( - (ChatColor.DARK_GREEN + "/disguiseradius ") + (ChatColor.DARK_GREEN + "/disguiseradius ") .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DRADIUS_HELP6( - ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguiseradius " + "EntityTypes"), + ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguiseradius EntityTypes"), D_PARSE_NOPERM(ChatColor.RED + "You do not have permission to use the option %s"), PARSE_NO_ARGS("No arguments defined"), - PARSE_NO_REF(ChatColor.RED + "Cannot find a disguise under the reference " + "%s"), + PARSE_NO_REF(ChatColor.RED + "Cannot find a disguise under the reference %s"), PARSE_NO_PERM_REF(ChatColor.RED + "You do not have perimssion to use disguise references!"), PARSE_DISG_NO_EXIST( - ChatColor.RED + "Error! The disguise " + ChatColor.GREEN + "%s" + ChatColor.RED + " " + "doesn't exist!"), + ChatColor.RED + "Error! The disguise " + ChatColor.GREEN + "%s" + ChatColor.RED + " doesn't exist!"), PARSE_CANT_DISG_UNKNOWN(ChatColor.RED + "Error! You cannot disguise as " + ChatColor.GREEN + "Unknown!"), - PARSE_CANT_LOAD(ChatColor.RED + "Error! This disguise " + "couldn't be loaded!"), + PARSE_CANT_LOAD(ChatColor.RED + "Error! This disguise couldn't be loaded!"), D_HELP1(ChatColor.DARK_GREEN + "Disguise another player!"), - D_HELP2(ChatColor.DARK_GREEN + "You can use the " + "disguises: %s"), - DMODRADIUS_USABLE(ChatColor.DARK_GREEN + "EntityTypes usable " + "are: %s" + ChatColor.DARK_GREEN + "."), - D_HELP3(ChatColor.DARK_GREEN + "/disguiseplayer player " + ""), - D_HELP4(ChatColor.DARK_GREEN + "/disguiseplayer " + " "), - D_HELP5(ChatColor.DARK_GREEN + "/disguiseplayer " + ""), - DMODRADIUS_UNRECOGNIZED(ChatColor.RED + "Unrecognised " + "EntityType %s"), + DMODRADIUS_USABLE(ChatColor.DARK_GREEN + "EntityTypes usable are: %s" + ChatColor.DARK_GREEN + "."), + D_HELP3(ChatColor.DARK_GREEN + "/disguiseplayer player "), + D_HELP4(ChatColor.DARK_GREEN + "/disguiseplayer "), + D_HELP5(ChatColor.DARK_GREEN + "/disguiseplayer "), + DMODRADIUS_UNRECOGNIZED(ChatColor.RED + "Unrecognised EntityType %s"), DMODRADIUS_NEEDOPTIONS(ChatColor.RED + "You need to supply the disguise options as well as the radius"), DRADIUS_NEEDOPTIONS(ChatColor.RED + "You need to supply a disguise as well as the radius"), DRADIUS_NEEDOPTIONS_ENTITY(ChatColor.RED + "You need to supply a disguise as well as the radius and EntityType"), - NOT_NUMBER(ChatColor.RED + "Error! %s is not a " + "number"), DRADIUS_MISCDISG( - ChatColor.RED + "Failed to disguise %s entities because the option to disguise a living entity " + "as" + " a non-living has been disabled in the config"), + NOT_NUMBER(ChatColor.RED + "Error! %s is not a number"), DRADIUS_MISCDISG( + ChatColor.RED + "Failed to disguise %s entities because the option to disguise a living entity as a non-living has been disabled in the config"), LIMITED_RADIUS(ChatColor.RED + "Limited radius to %s! Don't want to make too much lag right?"), - DISRADIUS(ChatColor.RED + "Successfully disguised %s" + " entities!"), + DISRADIUS(ChatColor.RED + "Successfully disguised %s entities!"), DISRADIUS_FAIL(ChatColor.RED + "Couldn't find any entities to disguise!"), DMODRADIUS_NEEDOPTIONS_ENTITY( - ChatColor.RED + "You need to " + "supply" + " the disguise options as well as the radius" + " and EntityType"), - NO_CONSOLE(ChatColor.RED + "You may not use this command from the console!"), CLICK_TIMER( - ChatColor.RED + "Right click a entity in the next %s" + " " + "seconds " + "to " + "grab " + "the disguise reference!"), + ChatColor.RED + "You need to supply the disguise options as well as the radius and EntityType"), + NO_CONSOLE(ChatColor.RED + "You may not use this command from the console!"), + CLICK_TIMER(ChatColor.RED + "Right click a entity in the next %s seconds to grab the disguise reference!"), UNDISRADIUS(ChatColor.RED + "Successfully undisguised %s entities!"), - UNDISG(ChatColor.RED + "You are no longer disguised"), UNDISG_FAIL(ChatColor.RED + "You are not disguised!"), + UNDISG(ChatColor.RED + "You are no longer disguised"), VIEW_SELF_ON(ChatColor.GREEN + "Toggled viewing own disguise off!"), - BLOWN_DISGUISE(ChatColor.RED + "Your disguise" + " was blown!"), + BLOWN_DISGUISE(ChatColor.RED + "Your disguise was blown!"), VIEW_SELF_OFF(ChatColor.GREEN + "Toggled viewing own disguise on!"), INVALID_CLONE( - ChatColor.DARK_RED + "Unknown " + "option '%s" + "' - Valid options are 'IgnoreEquipment' 'DoSneakSprint' 'DoSneak' 'DoSprint'"); - - static { - for (LibsMsg msg : values()) { - for (LibsMsg msg1 : values()) { - if (msg == msg1) - continue; - - if (!msg.getRaw().equalsIgnoreCase(msg1.getRaw())) - continue; - - System.out.println(msg.name() + " and " + msg1.name() + " conflict"); - } - } - - System.out.println("Alright dont forget to delete this libraryaddict!!!!!!!!!!!!!!!!!!"); - } + ChatColor.DARK_RED + "Unknown option '%s' - Valid options are 'IgnoreEquipment' 'DoSneakSprint' 'DoSneak' 'DoSprint'"); private String string; diff --git a/src/me/libraryaddict/disguise/utilities/TranslateType.java b/src/me/libraryaddict/disguise/utilities/TranslateType.java index 7b64fcca..91b643d4 100644 --- a/src/me/libraryaddict/disguise/utilities/TranslateType.java +++ b/src/me/libraryaddict/disguise/utilities/TranslateType.java @@ -24,7 +24,6 @@ public enum TranslateType { TranslateType(String fileName) { file = new File("plugins/LibsDisguises/Translations", fileName + ".yml"); - reload(); } public static void reloadTranslations() {