From 65e3384a960ada6b68c17601c20dff8ea4011350 Mon Sep 17 00:00:00 2001 From: GJ Date: Mon, 26 Mar 2012 16:17:35 -0400 Subject: [PATCH] Prep for mcLocale update. --- .../commands/general/AddlevelsCommand.java | 14 +++++------ .../commands/general/AddxpCommand.java | 14 +++++------ .../commands/general/InspectCommand.java | 24 +++++++++---------- .../commands/general/McstatsCommand.java | 8 +++---- .../commands/general/MmoeditCommand.java | 20 ++++++++-------- .../commands/general/MmoupdateCommand.java | 6 ++--- .../commands/general/XprateCommand.java | 6 ++--- .../nossr50/commands/mc/McabilityCommand.java | 2 +- .../gmail/nossr50/commands/mc/MccCommand.java | 2 +- .../nossr50/commands/mc/McgodCommand.java | 2 +- .../nossr50/commands/mc/McmmoCommand.java | 4 ++-- .../nossr50/commands/mc/McrefreshCommand.java | 4 ++-- .../nossr50/commands/mc/McremoveCommand.java | 14 +++++------ .../nossr50/commands/party/AcceptCommand.java | 2 +- .../nossr50/commands/party/InviteCommand.java | 6 ++--- .../nossr50/commands/party/PartyCommand.java | 2 +- .../nossr50/commands/party/PtpCommand.java | 16 ++++++------- .../commands/skills/AcrobaticsCommand.java | 2 +- .../commands/skills/ArcheryCommand.java | 2 +- .../nossr50/commands/skills/AxesCommand.java | 2 +- .../commands/skills/ExcavationCommand.java | 2 +- .../commands/skills/FishingCommand.java | 2 +- .../commands/skills/HerbalismCommand.java | 2 +- .../commands/skills/MiningCommand.java | 2 +- .../commands/skills/RepairCommand.java | 2 +- .../commands/skills/SwordsCommand.java | 2 +- .../commands/skills/TamingCommand.java | 2 +- .../commands/skills/UnarmedCommand.java | 3 +-- .../commands/skills/WoodcuttingCommand.java | 2 +- .../nossr50/commands/spout/MchudCommand.java | 4 ++-- .../nossr50/commands/spout/XplockCommand.java | 4 ++-- .../nossr50/datatypes/PlayerProfile.java | 4 ++-- .../nossr50/listeners/mcBlockListener.java | 2 -- .../java/com/gmail/nossr50/party/Party.java | 18 +++++--------- .../com/gmail/nossr50/skills/Herbalism.java | 2 +- .../java/com/gmail/nossr50/util/Page.java | 8 +++---- 36 files changed, 101 insertions(+), 112 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java index 41a990878..749564bd2 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java @@ -29,13 +29,13 @@ public class AddlevelsCommand implements CommandExecutor{ } if (player != null && !mcPermissions.getInstance().mmoedit(player)) { - sender.sendMessage("This command requires permissions."); + sender.sendMessage("This command requires permissions."); //TODO: Needs more locale. return true; } if (!(sender instanceof Player)) { if (args.length < 2) { - System.out.println("Usage is /addlevels playername skillname levels"); + System.out.println("Usage is /addlevels playername skillname levels"); //TODO: Needs more locale. return true; } else if (args.length == 3) { if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) { @@ -44,7 +44,7 @@ public class AddlevelsCommand implements CommandExecutor{ System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + "."); } } else { - System.out.println("Usage is /addlevels playername skillname levels"); + System.out.println("Usage is /addlevels playername skillname levels"); //TODO: Needs more locale. } return true; @@ -57,23 +57,23 @@ public class AddlevelsCommand implements CommandExecutor{ return true; } if (args.length < 2) { - player.sendMessage(ChatColor.RED + "Usage is /addlevels playername skillname levels"); + player.sendMessage(ChatColor.RED + "Usage is /addlevels playername skillname levels"); //TODO: Needs more locale. return true; } if (args.length == 3) { if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) { int levels = Integer.valueOf(args[2]); Users.getProfile(plugin.getServer().getPlayer(args[0])).addLevels(Skills.getSkillType(args[1]), levels); - player.sendMessage(ChatColor.RED + args[1] + " has been modified."); + player.sendMessage(ChatColor.RED + args[1] + " has been modified."); //TODO: Needs more locale. } } else if (args.length == 2) { if (m.isInt(args[1]) && Skills.isSkill(args[0])) { int levels = Integer.valueOf(args[1]); PP.addLevels(Skills.getSkillType(args[0]), levels); - player.sendMessage(ChatColor.RED + args[0] + " has been modified."); + player.sendMessage(ChatColor.RED + args[0] + " has been modified."); //TODO: Needs more locale. } } else { - player.sendMessage(ChatColor.RED + "Usage is /addlevels playername skillname newvalue"); + player.sendMessage(ChatColor.RED + "Usage is /addlevels playername skillname newvalue"); //TODO: Needs more locale. } return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java index 53857d8a4..aa57e3c47 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java @@ -28,7 +28,7 @@ public class AddxpCommand implements CommandExecutor { } if (player != null && !mcPermissions.getInstance().mmoedit(player)) { - sender.sendMessage("This command requires permissions."); + sender.sendMessage("This command requires permissions."); //TODO: Needs more locale. return true; } @@ -42,14 +42,14 @@ public class AddxpCommand implements CommandExecutor { if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) { int newvalue = Integer.valueOf(args[2]); Users.getProfile(plugin.getServer().getPlayer(args[0])).addXPOverrideNoBonus(Skills.getSkillType(args[1]), newvalue); - plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!"); + plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!"); //TODO: Needs more locale. System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + "."); Skills.XpCheckAll(plugin.getServer().getPlayer(args[0])); } } else { // No console aliasing yet // System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp"); - System.out.println("Usage is /addxp playername skillname xp"); + System.out.println("Usage is /addxp playername skillname xp"); //TODO: Needs more locale. } return true; } @@ -59,15 +59,15 @@ public class AddxpCommand implements CommandExecutor { return true; } if (args.length < 2) { - player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp"); + player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp"); //TODO: Needs more locale. return true; } if (args.length == 3) { if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) { int newvalue = Integer.valueOf(args[2]); Users.getProfile(plugin.getServer().getPlayer(args[0])).addXP(Skills.getSkillType(args[1]), newvalue, plugin.getServer().getPlayer(args[0])); - plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!"); - player.sendMessage(ChatColor.RED + args[1] + " has been modified."); + plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!"); //TODO: Needs more locale. + player.sendMessage(ChatColor.RED + args[1] + " has been modified."); //TODO: Needs more locale. Skills.XpCheckAll(plugin.getServer().getPlayer(args[0])); } } else if (args.length == 2 && m.isInt(args[1]) && Skills.isSkill(args[0])) { @@ -75,7 +75,7 @@ public class AddxpCommand implements CommandExecutor { Users.getProfile(player).addXP(Skills.getSkillType(args[0]), newvalue, player); player.sendMessage(ChatColor.RED + args[0] + " has been modified."); } else { - player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp"); + player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp"); //TODO: Needs more locale. } return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java index bbfd0cef4..2bfca452c 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java @@ -36,7 +36,7 @@ public class InspectCommand implements CommandExecutor { } if (args.length < 1) { - sender.sendMessage(ChatColor.RED + "Proper usage is /inspect "); + sender.sendMessage(ChatColor.RED + "Proper usage is /inspect "); //TODO: Needs more locale. return true; } @@ -49,12 +49,12 @@ public class InspectCommand implements CommandExecutor { //If they are not an Op they have to be close if(sender instanceof Player && !player.isOp() && !m.isNear(player.getLocation(), target.getLocation(), 5)) { - sender.sendMessage("You are too far away to inspect that player!"); + sender.sendMessage("You are too far away to inspect that player!"); //TODO: Needs more locale. } - sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for " + ChatColor.YELLOW + target.getName()); + sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for " + ChatColor.YELLOW + target.getName()); //TODO: Needs more locale. - sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-"); + sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-"); //TODO: Needs more locale. if (mcPermissions.getInstance().excavation(target)) sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION))); if (mcPermissions.getInstance().fishing(target)) @@ -66,7 +66,7 @@ public class InspectCommand implements CommandExecutor { if (mcPermissions.getInstance().woodcutting(target)) sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING))); - sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-"); + sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-"); //TODO: Needs more locale. if (mcPermissions.getInstance().axes(target)) sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES))); if (mcPermissions.getInstance().archery(target)) @@ -78,7 +78,7 @@ public class InspectCommand implements CommandExecutor { if (mcPermissions.getInstance().unarmed(target)) sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED))); - sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-"); + sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-"); //TODO: Needs more locale. if (mcPermissions.getInstance().acrobatics(target)) sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS))); if (mcPermissions.getInstance().repair(target)) @@ -88,7 +88,7 @@ public class InspectCommand implements CommandExecutor { } else { if(sender instanceof Player && !player.isOp()) { - sender.sendMessage("That player is offline, inspecting offline players is limited to Ops!"); + sender.sendMessage("That player is offline, inspecting offline players is limited to Ops!"); //TODO: Needs more locale. return true; } @@ -96,27 +96,27 @@ public class InspectCommand implements CommandExecutor { if(!PPt.isLoaded()) { - sender.sendMessage("Player does not exist in the database!"); + sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale. return true; } - sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for Offline Player " + ChatColor.YELLOW + args[0]); + sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for Offline Player " + ChatColor.YELLOW + args[0]); //TODO: Needs more locale. - sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-"); + sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-"); //TODO: Needs more locale. sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PPt.getSkillLevel(SkillType.FISHING), PPt.getSkillXpLevel(SkillType.FISHING), PPt.getXpToLevel(SkillType.FISHING))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PPt.getSkillLevel(SkillType.HERBALISM), PPt.getSkillXpLevel(SkillType.HERBALISM), PPt.getXpToLevel(SkillType.HERBALISM))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PPt.getSkillLevel(SkillType.MINING), PPt.getSkillXpLevel(SkillType.MINING), PPt.getXpToLevel(SkillType.MINING))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING))); - sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-"); + sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-"); //TODO: Needs more locale. sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PPt.getSkillLevel(SkillType.TAMING), PPt.getSkillXpLevel(SkillType.TAMING), PPt.getXpToLevel(SkillType.TAMING))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED))); - sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-"); + sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-"); //TODO: Needs more locale. sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR))); } diff --git a/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java index 3dc74bc9c..ccfe5cd82 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java @@ -25,7 +25,7 @@ public class McstatsCommand implements CommandExecutor { } if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } @@ -38,7 +38,7 @@ public class McstatsCommand implements CommandExecutor { ChatColor header = ChatColor.GOLD; if (Skills.hasGatheringSkills(player)) { - player.sendMessage(header + "-=GATHERING SKILLS=-"); + player.sendMessage(header + "-=GATHERING SKILLS=-"); //TODO: Needs more locale. if (mcPermissions.getInstance().excavation(player)) player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION))); if (mcPermissions.getInstance().fishing(player)) @@ -51,7 +51,7 @@ public class McstatsCommand implements CommandExecutor { player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING))); } if (Skills.hasCombatSkills(player)) { - player.sendMessage(header + "-=COMBAT SKILLS=-"); + player.sendMessage(header + "-=COMBAT SKILLS=-"); //TODO: Needs more locale. if (mcPermissions.getInstance().axes(player)) player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES))); if (mcPermissions.getInstance().archery(player)) @@ -65,7 +65,7 @@ public class McstatsCommand implements CommandExecutor { } if (Skills.hasMiscSkills(player)) { - player.sendMessage(header + "-=MISC SKILLS=-"); + player.sendMessage(header + "-=MISC SKILLS=-"); //TODO: Needs more locale. if (mcPermissions.getInstance().acrobatics(player)) player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS))); if (mcPermissions.getInstance().repair(player)) diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java index 18d64258f..74fc3112d 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java @@ -24,7 +24,7 @@ public class MmoeditCommand implements CommandExecutor { } if (player != null && !mcPermissions.getInstance().mmoedit(player)) { - sender.sendMessage("This command requires permissions."); + sender.sendMessage("This command requires permissions."); //TODO: Needs more locale. return true; } @@ -32,7 +32,7 @@ public class MmoeditCommand implements CommandExecutor { { if (args.length < 2) { - System.out.println("Usage is /mmoedit playername skillname newvalue"); + System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale. return true; } else if (args.length == 3) { @@ -47,7 +47,7 @@ public class MmoeditCommand implements CommandExecutor { if(!PPt.isLoaded()) { - sender.sendMessage("Player does not exist in the database!"); + sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale. return true; } @@ -55,11 +55,11 @@ public class MmoeditCommand implements CommandExecutor { { int newvalue = Integer.valueOf(args[2]); Users.getOfflineProfile(args[0]).modifyskill(Skills.getSkillType(args[1]), newvalue); - System.out.println(args[1] + " has been modified for " + args[0] + "."); + System.out.println(args[1] + " has been modified for " + args[0] + "."); //TODO: Needs more locale. } } else { - System.out.println("Usage is /mmoedit playername skillname newvalue"); + System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale. } return true; @@ -73,7 +73,7 @@ public class MmoeditCommand implements CommandExecutor { if (args.length < 2) { - player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); + player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale. return true; } if (args.length == 3) @@ -89,7 +89,7 @@ public class MmoeditCommand implements CommandExecutor { if(!PPt.isLoaded()) { - sender.sendMessage("Player does not exist in the database!"); + sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale. return true; } @@ -97,7 +97,7 @@ public class MmoeditCommand implements CommandExecutor { { int newvalue = Integer.valueOf(args[2]); PPt.modifyskill(Skills.getSkillType(args[1]), newvalue); - player.sendMessage(ChatColor.RED + args[1] + " has been modified for "+args[0]); + player.sendMessage(ChatColor.RED + args[1] + " has been modified for "+args[0]); //TODO: Needs more locale. } } else if (args.length == 2) { @@ -106,11 +106,11 @@ public class MmoeditCommand implements CommandExecutor { PlayerProfile PP = Users.getProfile(player); int newvalue = Integer.valueOf(args[1]); PP.modifyskill(Skills.getSkillType(args[0]), newvalue); - player.sendMessage(ChatColor.RED + args[0] + " has been modified."); + player.sendMessage(ChatColor.RED + args[0] + " has been modified."); //TODO: Needs more locale. } } else { - player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); + player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale. } return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java index 024ab0a80..4d91aefb9 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java @@ -17,7 +17,7 @@ public class MmoupdateCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } @@ -27,13 +27,13 @@ public class MmoupdateCommand implements CommandExecutor { player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission")); return true; } - player.sendMessage(ChatColor.GRAY + "Starting conversion..."); + player.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale. Users.clearUsers(); convertToMySQL(); for (Player x : Bukkit.getServer().getOnlinePlayers()) { Users.addUser(x); } - player.sendMessage(ChatColor.GREEN + "Conversion finished!"); + player.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java index 01c3e9f94..d5a341522 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java @@ -60,11 +60,11 @@ public class XprateCommand implements CommandExecutor { if(xpevent = true) for(Player x : Bukkit.getServer().getOnlinePlayers()) { - x.sendMessage(ChatColor.GOLD+"XP EVENT FOR mcMMO HAS STARTED!"); - x.sendMessage(ChatColor.GOLD+"mcMMO XP RATE IS NOW "+LoadProperties.xpGainMultiplier+"x!!"); + x.sendMessage(ChatColor.GOLD+"XP EVENT FOR mcMMO HAS STARTED!"); //TODO: Needs more locale. + x.sendMessage(ChatColor.GOLD+"mcMMO XP RATE IS NOW "+LoadProperties.xpGainMultiplier+"x!!"); //TODO: Needs more locale. } - System.out.println("The XP RATE was modified to "+LoadProperties.xpGainMultiplier); + System.out.println("The XP RATE was modified to "+LoadProperties.xpGainMultiplier); //TODO: Needs more locale. } return true; diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java index 3ca7fbeae..a4efcbc30 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java @@ -25,7 +25,7 @@ public class McabilityCommand implements CommandExecutor { } if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java index 3d9f481f3..6be57b764 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java @@ -20,7 +20,7 @@ public class MccCommand implements CommandExecutor { Player player = (Player) sender; - player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); + player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale. if (mcPermissions.getInstance().party(player)) { player.sendMessage(mcLocale.getString("m.mccPartyCommands")); diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java index 50d646493..01adb845d 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java @@ -16,7 +16,7 @@ public class McgodCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java index 554bb79cf..0cdd6c55a 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java @@ -16,7 +16,7 @@ public class McmmoCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } @@ -32,7 +32,7 @@ public class McmmoCommand implements CommandExecutor { if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) { SpoutPlayer sPlayer = (SpoutPlayer) player; if (LoadProperties.donateMessage) - sPlayer.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com"); + sPlayer.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com"); //Where'd our notification go? } else { if (LoadProperties.donateMessage) player.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com"); diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java index 6036c7035..bb25c51e3 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java @@ -23,7 +23,7 @@ public class McrefreshCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } @@ -35,7 +35,7 @@ public class McrefreshCommand implements CommandExecutor { return true; } if (args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) { - player.sendMessage("You have refreshed " + args[0] + "'s cooldowns!"); + player.sendMessage("You have refreshed " + args[0] + "'s cooldowns!"); //TODO: Needs more locale. player = plugin.getServer().getPlayer(args[0]); } diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java index 2bce9a71e..3d4d86977 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java @@ -29,7 +29,7 @@ public class McremoveCommand implements CommandExecutor { if(args.length == 0) { - sender.sendMessage("Correct usage is /mcremove [Player Name]"); + sender.sendMessage("Correct usage is /mcremove [Player Name]"); //TODO: Needs more locale. return true; } @@ -66,7 +66,7 @@ public class McremoveCommand implements CommandExecutor { +LoadProperties.MySQLtablePrefix+"experience WHERE " +LoadProperties.MySQLtablePrefix+"experience.user_id="+userId); - sender.sendMessage("User "+playerName+" removed from MySQL DB!"); + sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale. } else { //FlatFile removal //TODO: Properly remove users from FlatFile, it's going to be a huge bitch with how our FlatFile system works. Let's adopt SQLite support. @@ -76,13 +76,13 @@ public class McremoveCommand implements CommandExecutor { if(targetPlayer.isOnline()) { Users.getProfile(targetPlayer).resetAllData(); - sender.sendMessage("User "+playerName+" removed from FlatFile DB!"); + sender.sendMessage("User "+playerName+" removed from FlatFile DB!"); //TODO: Needs more locale. } else { - sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); + sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale. return true; } } else { - sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); + sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale. return true; } } @@ -93,7 +93,7 @@ public class McremoveCommand implements CommandExecutor { Player targetPlayer = Bukkit.getServer().getPlayer(playerName); if(targetPlayer.isOnline()) { - targetPlayer.kickPlayer("[mcMMO] Stats have been reset! Rejoin!"); + targetPlayer.kickPlayer("[mcMMO] Stats have been reset! Rejoin!"); //TODO: Needs more locale. Users.removeUserByName(playerName); } else { Users.removeUser(targetPlayer); @@ -102,7 +102,7 @@ public class McremoveCommand implements CommandExecutor { Users.removeUserByName(playerName); } - sender.sendMessage("[mcMMO] mcremove operation completed."); + sender.sendMessage("[mcMMO] mcremove operation completed."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java b/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java index e8d1c8eb2..645458b44 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java @@ -17,7 +17,7 @@ public class AcceptCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java index 66ce858a9..1a860be63 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java @@ -24,7 +24,7 @@ public class InviteCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } @@ -43,7 +43,7 @@ public class InviteCommand implements CommandExecutor { return true; } if (args.length < 1) { - player.sendMessage(ChatColor.RED + "Usage is /invite "); + player.sendMessage(ChatColor.RED + "Usage is /invite "); //TODO: Needs more locale. return true; } if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) { @@ -53,9 +53,7 @@ public class InviteCommand implements CommandExecutor { PPt.modifyInvite(PP.getParty()); player.sendMessage(mcLocale.getString("mcPlayerListener.InviteSuccess")); - // target.sendMessage(ChatColor.RED+"ALERT: "+ChatColor.GREEN+"You have received a party invite for "+PPt.getInvite()+" from "+player.getName()); target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite1", new Object[] { PPt.getInvite(), player.getName() })); - // target.sendMessage(ChatColor.YELLOW+"Type "+ChatColor.GREEN+LoadProperties.accept+ChatColor.YELLOW+" to accept the invite"); target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { "/accept" })); } else { player.sendMessage(mcLocale.getString("Party.Locked")); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java index e98bf9291..5761f2ef3 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -18,7 +18,7 @@ public class PartyCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java index 8c9e4c7ca..ac43dfc0c 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java @@ -25,7 +25,7 @@ public class PtpCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } @@ -39,23 +39,23 @@ public class PtpCommand implements CommandExecutor { if(!Party.getInstance().isParty(PP.getParty())) { - player.sendMessage(ChatColor.RED+"You are not in a party!"); + player.sendMessage(ChatColor.RED+"You are not in a party!"); //TODO: Needs more locale. return true; } if(PP.getRecentlyHurt()+(LoadProperties.ptpCommandCooldown*1000) > System.currentTimeMillis()) { - player.sendMessage(ChatColor.RED+"You've been hurt in the last " + LoadProperties.ptpCommandCooldown + " seconds and cannnot teleport."); + player.sendMessage(ChatColor.RED+"You've been hurt in the last " + LoadProperties.ptpCommandCooldown + " seconds and cannnot teleport."); //TODO: Needs more locale. return true; } if (args.length < 1) { - player.sendMessage(ChatColor.RED + "Usage is /ptp "); + player.sendMessage(ChatColor.RED + "Usage is /ptp "); //TODO: Needs more locale. return true; } if (plugin.getServer().getPlayer(args[0]) == null) { - player.sendMessage("That is not a valid player"); + player.sendMessage("That is not a valid player"); //TODO: Needs more locale. } if (plugin.getServer().getPlayer(args[0]) != null) { @@ -63,10 +63,10 @@ public class PtpCommand implements CommandExecutor { PlayerProfile PPt = Users.getProfile(target); if (PP.getParty().equals(PPt.getParty())) { player.teleport(target); - player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName()); - target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you."); + player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName()); //TODO: Needs more locale. + target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you."); //TODO: Needs more locale. } else { - player.sendMessage(ChatColor.RED + "That player is in a different party than you."); + player.sendMessage(ChatColor.RED + "That player is in a different party than you."); //TODO: Needs more locale. } } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index 9ce820be4..9688e2726 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -17,7 +17,7 @@ public class AcrobaticsCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java index b67e09f1c..eb632ddd6 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -16,7 +16,7 @@ public class ArcheryCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index 6396d4eb1..ebbfe7d28 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -15,7 +15,7 @@ public class AxesCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java index dc990ef1f..3f39acc02 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -16,7 +16,7 @@ public class ExcavationCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index 91592674b..71e53fb9d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -17,7 +17,7 @@ public class FishingCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java index 256d6ae3d..a60dfa90f 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java @@ -16,7 +16,7 @@ public class HerbalismCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java index 441fea609..054074bd7 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java @@ -16,7 +16,7 @@ public class MiningCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index d7aad5e96..8ddcf3fae 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -18,7 +18,7 @@ public class RepairCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java index 3e36dd7fc..8f0490a8c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -16,7 +16,7 @@ public class SwordsCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java index 24867505e..a1a800444 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -17,7 +17,7 @@ public class TamingCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index 4698aca30..543a652c4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -16,7 +16,7 @@ public class UnarmedCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } @@ -58,7 +58,6 @@ public class UnarmedCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed1_0"), mcLocale.getString("m.EffectsUnarmed1_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed2_0"), mcLocale.getString("m.EffectsUnarmed2_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed3_0"), mcLocale.getString("m.EffectsUnarmed3_1") })); - //player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed4_0"), mcLocale.getString("m.EffectsUnarmed4_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed5_0"), mcLocale.getString("m.EffectsUnarmed5_1") })); player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") })); player.sendMessage(mcLocale.getString("m.UnarmedArrowDeflectChance", new Object[] { arrowpercentage })); diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java index e330457a9..4cafd51ec 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -16,7 +16,7 @@ public class WoodcuttingCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java index 00b35e099..12b4ee965 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java @@ -16,12 +16,12 @@ public class MchudCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!LoadProperties.spoutEnabled) { - sender.sendMessage("This command is not enabled."); + sender.sendMessage("This command is not enabled."); //TODO: Needs more locale. return true; } if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java index d81ae7cb8..05de9271f 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java @@ -19,12 +19,12 @@ public class XplockCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (!LoadProperties.spoutEnabled || !LoadProperties.xpbar || !LoadProperties.xplockEnable) { - sender.sendMessage("This command is not enabled."); + sender.sendMessage("This command is not enabled."); //TODO: Needs more locale. return true; } if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); + sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale. return true; } diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java index 66e0e0529..f0008454c 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; + import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.events.McMMOPlayerXpGainEvent; import com.gmail.nossr50.party.Party; @@ -17,8 +18,7 @@ import com.gmail.nossr50.Users; import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; -public class PlayerProfile -{ +public class PlayerProfile { //HUD private HUDType hud; diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java index 57b25f661..3018468f8 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java @@ -40,8 +40,6 @@ import org.bukkit.metadata.FixedMetadataValue; import org.getspout.spoutapi.sound.SoundEffect; - - public class mcBlockListener implements Listener { private final mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/party/Party.java b/src/main/java/com/gmail/nossr50/party/Party.java index b816db4ac..f03a1cf00 100644 --- a/src/main/java/com/gmail/nossr50/party/Party.java +++ b/src/main/java/com/gmail/nossr50/party/Party.java @@ -139,8 +139,7 @@ public class Party { if(newOwner != null && p != null){ if(inSameParty(newOwner, p)) { - //TODO: Needs more locale. - p.sendMessage(newOwner.getName()+" is the new party owner."); + p.sendMessage(newOwner.getName()+" is the new party owner."); //TODO: Needs more locale } } } @@ -205,19 +204,16 @@ public class Party { { if(password == null) { - //TODO: Needs more locale. - player.sendMessage("This party requires a password. Use /party to join it."); + player.sendMessage("This party requires a password. Use /party to join it."); //TODO: Needs more locale. return; } else if(!password.equalsIgnoreCase(getPartyPassword(newParty))) { - //TODO: Needs more locale. - player.sendMessage("Party password incorrect."); + player.sendMessage("Party password incorrect."); //TODO: Needs more locale. return; } } else { - //TODO: Needs more locale. - player.sendMessage("Party is locked."); + player.sendMessage("Party is locked."); //TODO: Needs more locale. return; } } @@ -319,13 +315,11 @@ public class Party { if(playerKey.equalsIgnoreCase(playerName)) { partyPlayers.get(partyName).put(playerName, true); informPartyMembersOwnerChange(playerName); - //TODO: Needs more locale. - plugin.getServer().getPlayer(playerName).sendMessage("You are now the party owner."); + plugin.getServer().getPlayer(playerName).sendMessage("You are now the party owner."); //TODO: Needs more locale. continue; } if(partyPlayers.get(partyName).get(playerKey)) { - //TODO: Needs more locale. - plugin.getServer().getPlayer(playerKey).sendMessage("You are no longer party owner."); + plugin.getServer().getPlayer(playerKey).sendMessage("You are no longer party owner."); //TODO: Needs more locale. partyPlayers.get(partyName).put(playerKey, false); } } diff --git a/src/main/java/com/gmail/nossr50/skills/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/Herbalism.java index 42fc62f01..7155923ba 100644 --- a/src/main/java/com/gmail/nossr50/skills/Herbalism.java +++ b/src/main/java/com/gmail/nossr50/skills/Herbalism.java @@ -38,7 +38,7 @@ public class Herbalism { Material type = block.getType(); if (!hasSeeds) { - player.sendMessage("You need more seeds to spread Green Terra"); + player.sendMessage("You need more seeds to spread Green Terra"); //TODO: Needs more locale. } else if (hasSeeds && !block.getType().equals(Material.WHEAT)) { inventory.removeItem(new ItemStack(Material.SEEDS)); diff --git a/src/main/java/com/gmail/nossr50/util/Page.java b/src/main/java/com/gmail/nossr50/util/Page.java index c1e6842a2..0bf75e608 100644 --- a/src/main/java/com/gmail/nossr50/util/Page.java +++ b/src/main/java/com/gmail/nossr50/util/Page.java @@ -60,7 +60,7 @@ public class Page { public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) { String capitalized = m.getCapitalized(skilltype.toString()); - player.sendMessage(ChatColor.DARK_AQUA+"Guide for "+capitalized+" available type /"+skilltype.toString().toLowerCase()+" ? [Page#]"); + player.sendMessage(ChatColor.DARK_AQUA+"Guide for "+capitalized+" available type /"+skilltype.toString().toLowerCase()+" ? [Page#]"); //TODO: Needs more locale. if (args.length >= 1) { if(args[0].equals("?")) @@ -85,16 +85,16 @@ public class Page { } else if(args.length > 1 && m.getInt(args[1]) > Page.getTotalPageNumber(address)) { - player.sendMessage("That page doesn't exist, there are only "+Page.getTotalPageNumber(address)+" total pages"); + player.sendMessage("That page doesn't exist, there are only "+Page.getTotalPageNumber(address)+" total pages"); //TODO: Needs more locale. } else if(args.length > 1 && !m.isInt(args[1])) { - player.sendMessage("Not a valid page number!"); + player.sendMessage("Not a valid page number!"); //TODO: Needs more locale. } } else { - player.sendMessage(ChatColor.RED + "Usage is /"+skilltype.toString().toLowerCase()+" ? [page]"); + player.sendMessage(ChatColor.RED + "Usage is /"+skilltype.toString().toLowerCase()+" ? [page]"); //TODO: Needs more locale. } } }