From 491df2cc822044ca0778efc9911655ac54026c57 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sun, 12 Jan 2014 13:51:12 +0100 Subject: [PATCH] Changed the appearance of /mcmmo commands Closes #978 --- Changelog.txt | 1 + .../gmail/nossr50/commands/McmmoCommand.java | 72 ++++++++++--------- .../resources/locale/locale_en_US.properties | 40 +++++------ 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 158e0dab6..e5a47b5b4 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -30,6 +30,7 @@ Version 1.4.08-dev = Fixed bug which made it possible to gain XP by taming the same horse multiple times, if a player "untamed" that horse = Fixed bug where the /ptp request expiration time was checked wrongly - preventing players from using the command ! Updated localization files + ! Changed the appearance of /mcmmo commands ! Changed AxesCritical to CriticalHit in config file ! Changed several secondary ability permissions(deprecated versions still exist) ! Changed /ptp config setting, Commands.ptp.Confirm_Required is now Commands.ptp.Accept.Required diff --git a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java index 438ceadd4..3fa4fed10 100644 --- a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java @@ -42,9 +42,9 @@ public class McmmoCommand implements CommandExecutor { } sender.sendMessage(LocaleLoader.getString("Commands.mcc.Header")); - displayPartyCommands(sender); + displayGeneralCommands(sender); displayOtherCommands(sender); - + displayPartyCommands(sender); } return true; @@ -53,55 +53,57 @@ public class McmmoCommand implements CommandExecutor { } } - private void displayPartyCommands(CommandSender sender) { - if (Permissions.party(sender)) { - sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands")); - sender.sendMessage(" /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1")); - sender.sendMessage(" /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2")); - sender.sendMessage(" /party quit " + LocaleLoader.getString("Commands.Party.Quit")); + private void displayGeneralCommands(CommandSender sender) { + sender.sendMessage(ChatColor.DARK_AQUA + " /mcstats " + LocaleLoader.getString("Commands.Stats")); + sender.sendMessage(ChatColor.DARK_AQUA + " /" + LocaleLoader.getString("Commands.SkillInfo")); + sender.sendMessage(ChatColor.DARK_AQUA + " /mctop " + LocaleLoader.getString("Commands.Leaderboards")); - if (Permissions.partyChat(sender)) { - sender.sendMessage(" /party chat " + LocaleLoader.getString("Commands.Party.Toggle")); - } + if (Permissions.inspect(sender)) { + sender.sendMessage(ChatColor.DARK_AQUA + " /inspect " + LocaleLoader.getString("Commands.Inspect")); + } - sender.sendMessage(" /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite")); - sender.sendMessage(" /party accept " + LocaleLoader.getString("Commands.Party.Accept")); - - if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) { - sender.sendMessage(" /party teleport " + LocaleLoader.getString("Commands.Party.Teleport")); - } + if (Permissions.mcability(sender)) { + sender.sendMessage(ChatColor.DARK_AQUA + " /mcability " + LocaleLoader.getString("Commands.ToggleAbility")); } } private void displayOtherCommands(CommandSender sender) { sender.sendMessage(LocaleLoader.getString("Commands.Other")); - sender.sendMessage(" /mcstats " + LocaleLoader.getString("Commands.Stats")); - sender.sendMessage(" /mctop " + LocaleLoader.getString("Commands.Leaderboards")); if (Permissions.skillreset(sender)) { - sender.sendMessage(" /skillreset " + LocaleLoader.getString("Commands.Reset")); - } - - if (Permissions.mcability(sender)) { - sender.sendMessage(" /mcability " + LocaleLoader.getString("Commands.ToggleAbility")); - } - - if (Permissions.adminChat(sender)) { - sender.sendMessage(" /adminchat " + LocaleLoader.getString("Commands.AdminToggle")); - } - - if (Permissions.inspect(sender)) { - sender.sendMessage(" /inspect " + LocaleLoader.getString("Commands.Inspect")); + sender.sendMessage(ChatColor.DARK_AQUA + " /skillreset " + LocaleLoader.getString("Commands.Reset")); } if (Permissions.mmoedit(sender)) { - sender.sendMessage(" /mmoedit " + LocaleLoader.getString("Commands.mmoedit")); + sender.sendMessage(ChatColor.DARK_AQUA + " /mmoedit " + LocaleLoader.getString("Commands.mmoedit")); + } + + if (Permissions.adminChat(sender)) { + sender.sendMessage(ChatColor.DARK_AQUA + " /adminchat " + LocaleLoader.getString("Commands.AdminToggle")); } if (Permissions.mcgod(sender)) { - sender.sendMessage(" /mcgod " + LocaleLoader.getString("Commands.mcgod")); + sender.sendMessage(ChatColor.DARK_AQUA + " /mcgod " + LocaleLoader.getString("Commands.mcgod")); } + } - sender.sendMessage(" /" + LocaleLoader.getString("Commands.SkillInfo")); + private void displayPartyCommands(CommandSender sender) { + if (Permissions.party(sender)) { + sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands")); + sender.sendMessage(ChatColor.DARK_AQUA + " /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1")); + sender.sendMessage(ChatColor.DARK_AQUA + " /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2")); + sender.sendMessage(ChatColor.DARK_AQUA + " /party quit " + LocaleLoader.getString("Commands.Party.Quit")); + + if (Permissions.partyChat(sender)) { + sender.sendMessage(ChatColor.DARK_AQUA + " /party chat " + LocaleLoader.getString("Commands.Party.Toggle")); + } + + sender.sendMessage(ChatColor.DARK_AQUA + " /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite")); + sender.sendMessage(ChatColor.DARK_AQUA + " /party accept " + LocaleLoader.getString("Commands.Party.Accept")); + + if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) { + sender.sendMessage(ChatColor.DARK_AQUA + " /party teleport <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Teleport")); + } + } } } diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index d6f27d899..20858d25e 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -420,7 +420,7 @@ Commands.Ability.On=Ability use toggled [[GREEN]]on Commands.Ability.Toggle=Ability use has been toggled for [[YELLOW]]{0} Commands.AdminChat.Off=Admin Chat only [[RED]]Off Commands.AdminChat.On=Admin Chat only [[GREEN]]On -Commands.AdminToggle=[[RED]]- Toggle admin chat +Commands.AdminToggle=[[GREEN]]- Toggle admin chat Commands.Chat.Console=*Console* Commands.Cooldowns.Header=[[GOLD]]--= [[GREEN]]mcMMO Ability Cooldowns[[GOLD]] =-- Commands.Cooldowns.Row.N=\ [[RED]]{0}[[WHITE]] - [[GOLD]]{1} seconds left @@ -436,12 +436,12 @@ Commands.Healthbars.Changed.HEARTS=[mcMMO] Your healthbar display type was chang Commands.Healthbars.Changed.BAR=[mcMMO] Your healthbar display type was changed to [[YELLOW]]Boxes[[WHITE]]. Commands.Healthbars.Changed.DISABLED=[mcMMO] Your mob healthbars have been [[GRAY]]disabled[[WHITE]]. Commands.Healthbars.Invalid=Invalid healthbar type! -Commands.Inspect= [[RED]]- View detailed player info +Commands.Inspect= [[GREEN]]- View detailed player info Commands.Invite.Accepted=[[GREEN]]Invite Accepted. You have joined party {0} Commands.Invite.Success=[[GREEN]]Invite sent successfully. -Commands.Leaderboards= [[RED]]- Leaderboards -Commands.mcc.Header=[[RED]]---[][[YELLOW]]mcMMO Commands[[RED]][]--- -Commands.mcgod=[[RED]]- Toggle GodMode +Commands.Leaderboards= [[GREEN]]- Leaderboards +Commands.mcc.Header=[[RED]]---[][[GREEN]]mcMMO Commands[[RED]][]--- +Commands.mcgod=[[GREEN]]- Toggle GodMode Commands.mchud.Invalid=[[RED]]That is not a valid HUD type. Commands.mcpurge.Success=[[GREEN]]The database was successfully purged! Commands.mcrank.Heading=[[GOLD]]-=PERSONAL RANKINGS=- @@ -452,7 +452,7 @@ Commands.mcrank.Unranked=[[WHITE]]Unranked Commands.mcrefresh.Success=[[RED]]{0}''s cooldowns have been refreshed. Commands.mcremove.Success=[[GREEN]]{0} was successfully removed from the database! Commands.mctop.Tip=[[GOLD]]Tip: Use [[RED]]/mcrank[[GOLD]] to view all of your personal rankings! -Commands.mmoedit=[player] [[RED]] - Modify target +Commands.mmoedit=[player] [[GREEN]] - Modify target Commands.mmoedit.AllSkills.1=[[GREEN]]Your level in all skills was set to {0}! Commands.mmoedit.Modified.1=[[GREEN]]Your level in {0} was set to {1}! Commands.mmoedit.Modified.2=[[RED]]{0} has been modified for {1}. @@ -465,12 +465,12 @@ Commands.mcconvert.Experience.Invalid=[[RED]]Unknown formula type! Valid types a Commands.mcconvert.Experience.Same=[[RED]]Already using formula type {0} Commands.mcconvert.Experience.Start=[[GRAY]]Starting conversion from {0} to {1} curve Commands.mcconvert.Experience.Finish=[[GRAY]]Formula conversion complete; now using {0} XP curve. -Commands.ModDescription=[[RED]]- Read brief mod description +Commands.ModDescription=[[GREEN]]- Read brief mod description Commands.NoConsole=This command does not support console usage. Commands.Notifications.Off=Ability notifications toggled [[RED]]off Commands.Notifications.On=Ability notifications toggled [[GREEN]]on Commands.Offline=[[RED]]This command does not work for offline players. -Commands.Other=[[GREEN]]--OTHER COMMANDS-- +Commands.Other=[[RED]]---[][[GREEN]]OTHER COMMANDS[[RED]][]--- Commands.Party.Header=[[RED]]-----[][[GREEN]]PARTY[[RED]][]----- Commands.Party.Status=[[DARK_GRAY]]NAME: [[WHITE]]{0} {1} Commands.Party.ShareMode=[[DARK_GRAY]]SHARE MODE: @@ -478,13 +478,13 @@ Commands.Party.ItemShare=[[GRAY]]ITEM [[DARK_AQUA]]({0}) Commands.Party.ExpShare=[[GRAY]]EXP [[DARK_AQUA]]({0}) Commands.Party.ItemShareCategories=[[DARK_GRAY]]Sharing Items: [[GRAY]][[ITALIC]]{0} Commands.Party.MembersNear=[[DARK_GRAY]]NEAR YOU [[DARK_AQUA]]{0}[[DARK_GRAY]]/[[DARK_AQUA]]{1} -Commands.Party.Accept=[[RED]]- Accept party invite +Commands.Party.Accept=[[GREEN]]- Accept party invite Commands.Party.Chat.Off=Party Chat only [[RED]]Off Commands.Party.Chat.On=Party Chat only [[GREEN]]On -Commands.Party.Commands=[[GREEN]]--PARTY COMMANDS-- +Commands.Party.Commands=[[RED]]---[][[GREEN]]PARTY COMMANDS[[RED]][]--- Commands.Party.Invite.0=[[RED]]ALERT: [[GREEN]]You have received a party invite for {0} from {1} Commands.Party.Invite.1=[[YELLOW]]Type [[GREEN]]/party accept[[YELLOW]] to accept the invite -Commands.Party.Invite=[[RED]]- Send party invite +Commands.Party.Invite=[[GREEN]]- Send party invite Commands.Party.Join=[[GRAY]]Joined Party: {0} Commands.Party.Create=[[GRAY]]Created Party: {0} Commands.Party.Rename=[[GRAY]]Party name changed to: [[WHITE]]{0} @@ -495,11 +495,11 @@ Commands.Party.Kick=[[RED]]You were kicked from party {0}! Commands.Party.Leave=[[RED]]You have left that party Commands.Party.Members.Header=[[RED]]-----[][[GREEN]]MEMBERS[[RED]][]----- Commands.Party.None=[[RED]]You are not in a party. -Commands.Party.Quit=[[RED]]- Leave your current party -Commands.Party.Teleport= [[RED]]- Teleport to party member -Commands.Party.Toggle=[[RED]]- Toggle Party Chat -Commands.Party1=[[RED]]- Create a new party -Commands.Party2=[[RED]]- Join a players party +Commands.Party.Quit=[[GREEN]]- Leave your current party +Commands.Party.Teleport=[[GREEN]]- Teleport to party member +Commands.Party.Toggle=[[GREEN]]- Toggle Party Chat +Commands.Party1=[[GREEN]]- Create a new party +Commands.Party2=[[GREEN]]- Join a players party Commands.ptp.Enabled=Party teleporting [[GREEN]]enabled Commands.ptp.Disabled=Party teleporting [[RED]]disabled Commands.ptp.NoRequests=[[RED]]You have no teleport requests at this time @@ -514,7 +514,7 @@ Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Reset.All=[[GREEN]]All of your skill levels have been reset successfully. Commands.Reset.Single=[[GREEN]]Your {0} skill level has been reset successfully. -Commands.Reset=[[RED]]Reset a skill's level to 0 +Commands.Reset=[[GREEN]]- Reset a skill's level to 0 Commands.Scoreboard.Clear=[[DARK_AQUA]]mcMMO scoreboard cleared. Commands.Scoreboard.NoBoard=[[RED]]The mcMMO scoreboard is not active. Commands.Scoreboard.Keep=[[DARK_AQUA]]The mcMMO scoreboard will stay up until you use [[GREEN]]/mcscoreboard clear[[DARK_AQUA]]. @@ -527,10 +527,10 @@ Commands.Scoreboard.Tip.Keep=[[GOLD]]Tip: Use [[RED]]/mcscoreboard keep[[GOLD]] Commands.Scoreboard.Tip.Clear=[[GOLD]]Tip: Use [[RED]]/mcscoreboard clear[[GOLD]] to get rid of the scoreboard. Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- -Commands.SkillInfo=[[RED]]- View detailed information about a skill +Commands.SkillInfo=[[GREEN]]- View detailed information about a skill Commands.Stats.Self=YOUR STATS -Commands.Stats=[[RED]]- View your mcMMO stats -Commands.ToggleAbility=[[RED]]- Toggle ability activation with right click +Commands.Stats=[[GREEN]]- View your mcMMO stats +Commands.ToggleAbility=[[GREEN]]- Toggle ability activation with right click Commands.Usage.0=[[RED]]Proper usage is /{0} Commands.Usage.1=[[RED]]Proper usage is /{0} {1} Commands.Usage.2=[[RED]]Proper usage is /{0} {1} {2}