From 44e3e4d1e10bc96d260c78f3141bdf7950518321 Mon Sep 17 00:00:00 2001 From: riking Date: Tue, 8 Oct 2013 21:12:04 -0700 Subject: [PATCH] Localize several command results Also don't nullcheck the null-guarded mcMMOPlayer in PartyManager --- .../gmail/nossr50/commands/McabilityCommand.java | 2 +- .../com/gmail/nossr50/commands/McgodCommand.java | 2 +- .../gmail/nossr50/commands/MobhealthCommand.java | 6 +++--- .../commands/database/ConvertDatabaseCommand.java | 13 ++++--------- .../java/com/gmail/nossr50/party/PartyManager.java | 6 +----- src/main/resources/locale/locale_en_US.properties | 6 ++++++ 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java b/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java index 35d86956e..57f7e47fe 100644 --- a/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java @@ -24,6 +24,6 @@ public class McabilityCommand extends ToggleCommand { @Override protected void sendSuccessMessage(CommandSender sender) { - sender.sendMessage("Ability use has been toggled for " + player.getName()); // TODO: Localize + sender.sendMessage(LocaleLoader.getString("Commands.Ability.Toggle")); } } diff --git a/src/main/java/com/gmail/nossr50/commands/McgodCommand.java b/src/main/java/com/gmail/nossr50/commands/McgodCommand.java index 246f00c7d..0a6710e23 100644 --- a/src/main/java/com/gmail/nossr50/commands/McgodCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McgodCommand.java @@ -24,6 +24,6 @@ public class McgodCommand extends ToggleCommand { @Override protected void sendSuccessMessage(CommandSender sender) { - sender.sendMessage("God mode has been toggled for " + player.getName()); // TODO: Localize + sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Success")); } } diff --git a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java index d0f57aa86..4cc1d1a04 100644 --- a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java @@ -12,9 +12,9 @@ import org.bukkit.util.StringUtil; import com.gmail.nossr50.datatypes.MobHealthbarType; import com.gmail.nossr50.datatypes.player.PlayerProfile; +import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.commands.CommandUtils; import com.gmail.nossr50.util.player.UserManager; - import com.google.common.collect.ImmutableList; public class MobhealthCommand implements TabExecutor { @@ -44,11 +44,11 @@ public class MobhealthCommand implements TabExecutor { try { MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim()); playerProfile.setMobHealthbarType(type); - sender.sendMessage("Display type changed to: " + type); //TODO: Localize + sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Changed." + type.name())); return true; } catch (IllegalArgumentException ex) { - sender.sendMessage("Invalid type!"); //TODO: Localize + sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Invalid")); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java b/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java index b2806b96f..2bcea962c 100644 --- a/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java @@ -22,7 +22,7 @@ public class ConvertDatabaseCommand implements CommandExecutor { DatabaseType previousType = DatabaseType.getDatabaseType(args[1]); DatabaseType newType = mcMMO.getDatabaseManager().getDatabaseType(); - if ((newType == DatabaseType.CUSTOM && DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1])) || previousType == newType) { + if (previousType == newType || (newType == DatabaseType.CUSTOM && DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1]))) { sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Same", newType.toString())); return true; } @@ -39,17 +39,12 @@ public class ConvertDatabaseCommand implements CommandExecutor { sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1])); return true; } - } - catch (Exception e) { - sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1])); - return true; - } - try { oldDatabase = DatabaseManagerFactory.createCustomDatabaseManager((Class) clazz); } - catch (Throwable t) { - sender.sendMessage("An error occurred during the conversion process."); // TODO: Localize + catch (Throwable e) { + e.printStackTrace(); + sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1])); return true; } } diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index ebb6b885d..777b5166d 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -189,11 +189,7 @@ public final class PartyManager { public static Party getParty(Player player) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if (mcMMOPlayer != null) { - return mcMMOPlayer.getParty(); - } - - return getPlayerParty(player.getName()); + return mcMMOPlayer.getParty(); } /** diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 5f5c5012d..ce471468e 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -417,6 +417,7 @@ Commands.addxp.AwardAll=[[GREEN]]You were awarded {0} experience in all skills! Commands.addxp.AwardSkill=[[GREEN]]You were awarded {0} experience in {1}! Commands.Ability.Off=Ability use toggled [[RED]]off 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 @@ -426,6 +427,11 @@ Commands.DoesNotExist= [[RED]]Player does not exist in the database! Commands.GodMode.Disabled=[[YELLOW]]mcMMO Godmode Disabled Commands.GodMode.Enabled=[[YELLOW]]mcMMO Godmode Enabled Commands.GodMode.Forbidden=[mcMMO] God Mode not permitted on this world (See Permissions) +Commands.GodMode.Toggle=God mode has been toggled for [[YELLOW]]{0} +Commands.Healthbars.Changed.HEARTS=[mcMMO] Your healthbar display type was changed to [[RED]]Hearts[[WHITE]]. +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.Invite.Accepted=[[GREEN]]Invite Accepted. You have joined party {0} Commands.Invite.Success=[[GREEN]]Invite sent successfully.