Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-31 21:18:16 +01:00
Code Issues Projects Releases Wiki Activity

Prep for mcLocale update.

Browse Source
This commit is contained in:
GJ 2012-03-26 16:17:35 -04:00
parent 945fb5ed55
commit 65e3384a96
36 changed files with 101 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java
View File

@ -29,13 +29,13 @@ public class AddlevelsCommand implements CommandExecutor{
} }
if (player != null && !mcPermissions.getInstance().mmoedit(player)) { 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; return true;
} }
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
if (args.length < 2) { 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; return true;
} else if (args.length == 3) { } else if (args.length == 3) {
if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) { 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() + "."); System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
} }
} else { } 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; return true;
@ -57,23 +57,23 @@ public class AddlevelsCommand implements CommandExecutor{
return true; return true;
} }
if (args.length < 2) { 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; return true;
} }
if (args.length == 3) { if (args.length == 3) {
if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) { if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
int levels = Integer.valueOf(args[2]); int levels = Integer.valueOf(args[2]);
Users.getProfile(plugin.getServer().getPlayer(args[0])).addLevels(Skills.getSkillType(args[1]), levels); 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) { } else if (args.length == 2) {
if (m.isInt(args[1]) && Skills.isSkill(args[0])) { if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
int levels = Integer.valueOf(args[1]); int levels = Integer.valueOf(args[1]);
PP.addLevels(Skills.getSkillType(args[0]), levels); 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 { } 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; return true;

14
src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java
View File

@ -28,7 +28,7 @@ public class AddxpCommand implements CommandExecutor {
} }
if (player != null && !mcPermissions.getInstance().mmoedit(player)) { 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; 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])) { if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
int newvalue = Integer.valueOf(args[2]); int newvalue = Integer.valueOf(args[2]);
Users.getProfile(plugin.getServer().getPlayer(args[0])).addXPOverrideNoBonus(Skills.getSkillType(args[1]), newvalue); 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() + "."); System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
Skills.XpCheckAll(plugin.getServer().getPlayer(args[0])); Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
} }
} else { } else {
// No console aliasing yet // No console aliasing yet
// System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp"); // 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; return true;
} }
@ -59,15 +59,15 @@ public class AddxpCommand implements CommandExecutor {
return true; return true;
} }
if (args.length < 2) { 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; return true;
} }
if (args.length == 3) { if (args.length == 3) {
if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) { if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
int newvalue = Integer.valueOf(args[2]); int newvalue = Integer.valueOf(args[2]);
Users.getProfile(plugin.getServer().getPlayer(args[0])).addXP(Skills.getSkillType(args[1]), newvalue, plugin.getServer().getPlayer(args[0])); 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!"); plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!"); //TODO: Needs more locale.
player.sendMessage(ChatColor.RED + args[1] + " has been modified."); player.sendMessage(ChatColor.RED + args[1] + " has been modified."); //TODO: Needs more locale.
Skills.XpCheckAll(plugin.getServer().getPlayer(args[0])); Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
} }
} else if (args.length == 2 && m.isInt(args[1]) && Skills.isSkill(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); Users.getProfile(player).addXP(Skills.getSkillType(args[0]), newvalue, player);
player.sendMessage(ChatColor.RED + args[0] + " has been modified."); player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
} else { } 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; return true;

24
src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java
View File

@ -36,7 +36,7 @@ public class InspectCommand implements CommandExecutor {
} }
if (args.length < 1) { if (args.length < 1) {
sender.sendMessage(ChatColor.RED + "Proper usage is /inspect <playername>"); sender.sendMessage(ChatColor.RED + "Proper usage is /inspect <playername>"); //TODO: Needs more locale.
return true; return true;
} }
@ -49,12 +49,12 @@ public class InspectCommand implements CommandExecutor {
//If they are not an Op they have to be close //If they are not an Op they have to be close
if(sender instanceof Player && !player.isOp() && !m.isNear(player.getLocation(), target.getLocation(), 5)) 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)) 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))); 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)) if (mcPermissions.getInstance().fishing(target))
@ -66,7 +66,7 @@ public class InspectCommand implements CommandExecutor {
if (mcPermissions.getInstance().woodcutting(target)) 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(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)) 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))); 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)) if (mcPermissions.getInstance().archery(target))
@ -78,7 +78,7 @@ public class InspectCommand implements CommandExecutor {
if (mcPermissions.getInstance().unarmed(target)) 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(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)) 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))); 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)) if (mcPermissions.getInstance().repair(target))
@ -88,7 +88,7 @@ public class InspectCommand implements CommandExecutor {
} else { } else {
if(sender instanceof Player && !player.isOp()) 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; return true;
} }
@ -96,27 +96,27 @@ public class InspectCommand implements CommandExecutor {
if(!PPt.isLoaded()) 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; 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.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.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.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.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(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.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.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.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.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(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.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))); sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));
} }

8
src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java
View File

@ -25,7 +25,7 @@ public class McstatsCommand implements CommandExecutor {
} }
if (!(sender instanceof Player)) { 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; return true;
} }
@ -38,7 +38,7 @@ public class McstatsCommand implements CommandExecutor {
ChatColor header = ChatColor.GOLD; ChatColor header = ChatColor.GOLD;
if (Skills.hasGatheringSkills(player)) { if (Skills.hasGatheringSkills(player)) {
player.sendMessage(header + "-=GATHERING SKILLS=-"); player.sendMessage(header + "-=GATHERING SKILLS=-"); //TODO: Needs more locale.
if (mcPermissions.getInstance().excavation(player)) 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))); 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)) 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))); player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING)));
} }
if (Skills.hasCombatSkills(player)) { if (Skills.hasCombatSkills(player)) {
player.sendMessage(header + "-=COMBAT SKILLS=-"); player.sendMessage(header + "-=COMBAT SKILLS=-"); //TODO: Needs more locale.
if (mcPermissions.getInstance().axes(player)) 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))); 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)) if (mcPermissions.getInstance().archery(player))
@ -65,7 +65,7 @@ public class McstatsCommand implements CommandExecutor {
} }
if (Skills.hasMiscSkills(player)) { if (Skills.hasMiscSkills(player)) {
player.sendMessage(header + "-=MISC SKILLS=-"); player.sendMessage(header + "-=MISC SKILLS=-"); //TODO: Needs more locale.
if (mcPermissions.getInstance().acrobatics(player)) 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))); 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)) if (mcPermissions.getInstance().repair(player))

20
src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java
View File

@ -24,7 +24,7 @@ public class MmoeditCommand implements CommandExecutor {
} }
if (player != null && !mcPermissions.getInstance().mmoedit(player)) { 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; return true;
} }
@ -32,7 +32,7 @@ public class MmoeditCommand implements CommandExecutor {
{ {
if (args.length < 2) 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; return true;
} else if (args.length == 3) } else if (args.length == 3)
{ {
@ -47,7 +47,7 @@ public class MmoeditCommand implements CommandExecutor {
if(!PPt.isLoaded()) 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; return true;
} }
@ -55,11 +55,11 @@ public class MmoeditCommand implements CommandExecutor {
{ {
int newvalue = Integer.valueOf(args[2]); int newvalue = Integer.valueOf(args[2]);
Users.getOfflineProfile(args[0]).modifyskill(Skills.getSkillType(args[1]), newvalue); 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 } 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; return true;
@ -73,7 +73,7 @@ public class MmoeditCommand implements CommandExecutor {
if (args.length < 2) 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; return true;
} }
if (args.length == 3) if (args.length == 3)
@ -89,7 +89,7 @@ public class MmoeditCommand implements CommandExecutor {
if(!PPt.isLoaded()) 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; return true;
} }
@ -97,7 +97,7 @@ public class MmoeditCommand implements CommandExecutor {
{ {
int newvalue = Integer.valueOf(args[2]); int newvalue = Integer.valueOf(args[2]);
PPt.modifyskill(Skills.getSkillType(args[1]), newvalue); 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) } else if (args.length == 2)
{ {
@ -106,11 +106,11 @@ public class MmoeditCommand implements CommandExecutor {
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
int newvalue = Integer.valueOf(args[1]); int newvalue = Integer.valueOf(args[1]);
PP.modifyskill(Skills.getSkillType(args[0]), newvalue); 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 } 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; return true;

6
src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java
View File

@ -17,7 +17,7 @@ public class MmoupdateCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }
@ -27,13 +27,13 @@ public class MmoupdateCommand implements CommandExecutor {
player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission")); player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
return true; return true;
} }
player.sendMessage(ChatColor.GRAY + "Starting conversion..."); player.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
Users.clearUsers(); Users.clearUsers();
convertToMySQL(); convertToMySQL();
for (Player x : Bukkit.getServer().getOnlinePlayers()) { for (Player x : Bukkit.getServer().getOnlinePlayers()) {
Users.addUser(x); Users.addUser(x);
} }
player.sendMessage(ChatColor.GREEN + "Conversion finished!"); player.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
return true; return true;
} }

6
src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java
View File

@ -60,11 +60,11 @@ public class XprateCommand implements CommandExecutor {
if(xpevent = true) if(xpevent = true)
for(Player x : Bukkit.getServer().getOnlinePlayers()) for(Player x : Bukkit.getServer().getOnlinePlayers())
{ {
x.sendMessage(ChatColor.GOLD+"XP EVENT FOR mcMMO HAS STARTED!"); 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!!"); 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; return true;

2
src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java
View File

@ -25,7 +25,7 @@ public class McabilityCommand implements CommandExecutor {
} }
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java
View File

@ -20,7 +20,7 @@ public class MccCommand implements CommandExecutor {
Player player = (Player) sender; 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)) { if (mcPermissions.getInstance().party(player)) {
player.sendMessage(mcLocale.getString("m.mccPartyCommands")); player.sendMessage(mcLocale.getString("m.mccPartyCommands"));

2
src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java
View File

@ -16,7 +16,7 @@ public class McgodCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

4
src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
View File

@ -16,7 +16,7 @@ public class McmmoCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }
@ -32,7 +32,7 @@ public class McmmoCommand implements CommandExecutor {
if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) { if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) {
SpoutPlayer sPlayer = (SpoutPlayer) player; SpoutPlayer sPlayer = (SpoutPlayer) player;
if (LoadProperties.donateMessage) 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 { } else {
if (LoadProperties.donateMessage) if (LoadProperties.donateMessage)
player.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com"); player.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com");

4
src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java
View File

@ -23,7 +23,7 @@ public class McrefreshCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }
@ -35,7 +35,7 @@ public class McrefreshCommand implements CommandExecutor {
return true; return true;
} }
if (args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) { 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]); player = plugin.getServer().getPlayer(args[0]);
} }

14
src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
View File

@ -29,7 +29,7 @@ public class McremoveCommand implements CommandExecutor {
if(args.length == 0) 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; return true;
} }
@ -66,7 +66,7 @@ public class McremoveCommand implements CommandExecutor {
+LoadProperties.MySQLtablePrefix+"experience WHERE " +LoadProperties.MySQLtablePrefix+"experience WHERE "
+LoadProperties.MySQLtablePrefix+"experience.user_id="+userId); +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 { } else {
//FlatFile removal //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. //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()) if(targetPlayer.isOnline())
{ {
Users.getProfile(targetPlayer).resetAllData(); 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 { } 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; return true;
} }
} else { } 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; return true;
} }
} }
@ -93,7 +93,7 @@ public class McremoveCommand implements CommandExecutor {
Player targetPlayer = Bukkit.getServer().getPlayer(playerName); Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
if(targetPlayer.isOnline()) 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); Users.removeUserByName(playerName);
} else { } else {
Users.removeUser(targetPlayer); Users.removeUser(targetPlayer);
@ -102,7 +102,7 @@ public class McremoveCommand implements CommandExecutor {
Users.removeUserByName(playerName); Users.removeUserByName(playerName);
} }
sender.sendMessage("[mcMMO] mcremove operation completed."); sender.sendMessage("[mcMMO] mcremove operation completed."); //TODO: Needs more locale.
return true; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java
View File

@ -17,7 +17,7 @@ public class AcceptCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

6
src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java
View File

@ -24,7 +24,7 @@ public class InviteCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }
@ -43,7 +43,7 @@ public class InviteCommand implements CommandExecutor {
return true; return true;
} }
if (args.length < 1) { if (args.length < 1) {
player.sendMessage(ChatColor.RED + "Usage is /invite <playername>"); player.sendMessage(ChatColor.RED + "Usage is /invite <playername>"); //TODO: Needs more locale.
return true; return true;
} }
if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) { 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()); PPt.modifyInvite(PP.getParty());
player.sendMessage(mcLocale.getString("mcPlayerListener.InviteSuccess")); 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(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" })); target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { "/accept" }));
} else { } else {
player.sendMessage(mcLocale.getString("Party.Locked")); player.sendMessage(mcLocale.getString("Party.Locked"));

2
src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
View File

@ -18,7 +18,7 @@ public class PartyCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

16
src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
View File

@ -25,7 +25,7 @@ public class PtpCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }
@ -39,23 +39,23 @@ public class PtpCommand implements CommandExecutor {
if(!Party.getInstance().isParty(PP.getParty())) 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; return true;
} }
if(PP.getRecentlyHurt()+(LoadProperties.ptpCommandCooldown*1000) > System.currentTimeMillis()) 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; return true;
} }
if (args.length < 1) { if (args.length < 1) {
player.sendMessage(ChatColor.RED + "Usage is /ptp <playername>"); player.sendMessage(ChatColor.RED + "Usage is /ptp <playername>"); //TODO: Needs more locale.
return true; return true;
} }
if (plugin.getServer().getPlayer(args[0]) == null) { 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) { if (plugin.getServer().getPlayer(args[0]) != null) {
@ -63,10 +63,10 @@ public class PtpCommand implements CommandExecutor {
PlayerProfile PPt = Users.getProfile(target); PlayerProfile PPt = Users.getProfile(target);
if (PP.getParty().equals(PPt.getParty())) { if (PP.getParty().equals(PPt.getParty())) {
player.teleport(target); player.teleport(target);
player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName()); player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName()); //TODO: Needs more locale.
target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you."); target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you."); //TODO: Needs more locale.
} else { } 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.
} }
} }

2
src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
View File

@ -17,7 +17,7 @@ public class AcrobaticsCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
View File

@ -16,7 +16,7 @@ public class ArcheryCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
View File

@ -15,7 +15,7 @@ public class AxesCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
View File

@ -16,7 +16,7 @@ public class ExcavationCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@ -17,7 +17,7 @@ public class FishingCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
View File

@ -16,7 +16,7 @@ public class HerbalismCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
View File

@ -16,7 +16,7 @@ public class MiningCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
View File

@ -18,7 +18,7 @@ public class RepairCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
View File

@ -16,7 +16,7 @@ public class SwordsCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

2
src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
View File

@ -17,7 +17,7 @@ public class TamingCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

3
src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
View File

@ -16,7 +16,7 @@ public class UnarmedCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; 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.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.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.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.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.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
player.sendMessage(mcLocale.getString("m.UnarmedArrowDeflectChance", new Object[] { arrowpercentage })); player.sendMessage(mcLocale.getString("m.UnarmedArrowDeflectChance", new Object[] { arrowpercentage }));

2
src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
View File

@ -16,7 +16,7 @@ public class WoodcuttingCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) { 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; return true;
} }

4
src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java
View File

@ -16,12 +16,12 @@ public class MchudCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.spoutEnabled) { if (!LoadProperties.spoutEnabled) {
sender.sendMessage("This command is not enabled."); sender.sendMessage("This command is not enabled."); //TODO: Needs more locale.
return true; return true;
} }
if (!(sender instanceof Player)) { 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; return true;
} }

4
src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
View File

@ -19,12 +19,12 @@ public class XplockCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.spoutEnabled || !LoadProperties.xpbar || !LoadProperties.xplockEnable) { 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; return true;
} }
if (!(sender instanceof Player)) { 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; return true;
} }

4
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -10,6 +10,7 @@ import java.util.ArrayList;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.events.McMMOPlayerXpGainEvent; import com.gmail.nossr50.events.McMMOPlayerXpGainEvent;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
@ -17,8 +18,7 @@ import com.gmail.nossr50.Users;
import com.gmail.nossr50.m; import com.gmail.nossr50.m;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
public class PlayerProfile public class PlayerProfile {
{
//HUD //HUD
private HUDType hud; private HUDType hud;

2
src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -40,8 +40,6 @@ import org.bukkit.metadata.FixedMetadataValue;
import org.getspout.spoutapi.sound.SoundEffect; import org.getspout.spoutapi.sound.SoundEffect;
public class mcBlockListener implements Listener { public class mcBlockListener implements Listener {
private final mcMMO plugin; private final mcMMO plugin;

18
src/main/java/com/gmail/nossr50/party/Party.java
View File

@ -139,8 +139,7 @@ public class Party {
if(newOwner != null && p != null){ if(newOwner != null && p != null){
if(inSameParty(newOwner, p)) if(inSameParty(newOwner, p))
{ {
//TODO: Needs more locale. p.sendMessage(newOwner.getName()+" is the new party owner."); //TODO: Needs more locale
p.sendMessage(newOwner.getName()+" is the new party owner.");
} }
} }
} }
@ -205,19 +204,16 @@ public class Party {
{ {
if(password == null) if(password == null)
{ {
//TODO: Needs more locale. player.sendMessage("This party requires a password. Use /party <party> <password> to join it."); //TODO: Needs more locale.
player.sendMessage("This party requires a password. Use /party <party> <password> to join it.");
return; return;
} else if(!password.equalsIgnoreCase(getPartyPassword(newParty))) } else if(!password.equalsIgnoreCase(getPartyPassword(newParty)))
{ {
//TODO: Needs more locale. player.sendMessage("Party password incorrect."); //TODO: Needs more locale.
player.sendMessage("Party password incorrect.");
return; return;
} }
} else } else
{ {
//TODO: Needs more locale. player.sendMessage("Party is locked."); //TODO: Needs more locale.
player.sendMessage("Party is locked.");
return; return;
} }
} }
@ -319,13 +315,11 @@ public class Party {
if(playerKey.equalsIgnoreCase(playerName)) { if(playerKey.equalsIgnoreCase(playerName)) {
partyPlayers.get(partyName).put(playerName, true); partyPlayers.get(partyName).put(playerName, true);
informPartyMembersOwnerChange(playerName); informPartyMembersOwnerChange(playerName);
//TODO: Needs more locale. plugin.getServer().getPlayer(playerName).sendMessage("You are now the party owner."); //TODO: Needs more locale.
plugin.getServer().getPlayer(playerName).sendMessage("You are now the party owner.");
continue; continue;
} }
if(partyPlayers.get(partyName).get(playerKey)) { if(partyPlayers.get(partyName).get(playerKey)) {
//TODO: Needs more locale. plugin.getServer().getPlayer(playerKey).sendMessage("You are no longer party owner."); //TODO: Needs more locale.
plugin.getServer().getPlayer(playerKey).sendMessage("You are no longer party owner.");
partyPlayers.get(partyName).put(playerKey, false); partyPlayers.get(partyName).put(playerKey, false);
} }
} }

2
src/main/java/com/gmail/nossr50/skills/Herbalism.java
View File

@ -38,7 +38,7 @@ public class Herbalism {
Material type = block.getType(); Material type = block.getType();
if (!hasSeeds) { 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)) { else if (hasSeeds && !block.getType().equals(Material.WHEAT)) {
inventory.removeItem(new ItemStack(Material.SEEDS)); inventory.removeItem(new ItemStack(Material.SEEDS));

8
src/main/java/com/gmail/nossr50/util/Page.java
View File

@ -60,7 +60,7 @@ public class Page {
public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args)
{ {
String capitalized = m.getCapitalized(skilltype.toString()); 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.length >= 1)
{ {
if(args[0].equals("?")) if(args[0].equals("?"))
@ -85,16 +85,16 @@ public class Page {
} }
else if(args.length > 1 && m.getInt(args[1]) > Page.getTotalPageNumber(address)) 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])) 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 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.
} }
} }
} }