Merge branch 'master' of https://github.com/essentials/Essentials

18 files changed, 53 insertions, 21 deletions

diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
index c95c6a5cf..442729f16 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
@@ -21,8 +21,9 @@ public class Commandmangadd extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		final String group = args[0];
-
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+group+" create");
+		String command = "/permissions g:" + group + " create";
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
index ea250de6e..f2eb55ee4 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
@@ -22,7 +22,9 @@ public class Commandmangaddi extends EssentialsCommand
 		}
 		final String target = args[0];
 		final String group = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+target+" parents add "+group+"");
+		String command = "/permissions g:"+target+" parents add "+group;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
index 214e81f39..e57628c57 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
@@ -22,7 +22,9 @@ public class Commandmangaddp extends EssentialsCommand
 		}
 		final String target = args[0];
 		final String perm = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+target+" perms add "+perm+"");
+		String command = "/permissions g:"+target+" perms add "+perm;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
index fb11eac72..106dcd791 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
@@ -22,7 +22,9 @@ public class Commandmangcheckp extends EssentialsCommand
 		}
 		final String target = args[0];
 		final String perm = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+target+" has "+perm+"");
+		String command = "/permissions g:"+target+" has "+perm;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
index 32126c564..52fdc3da2 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
@@ -21,7 +21,9 @@ public class Commandmangdel extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		final String group = args[0];
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+group+" delete");
+		String command = "/permissions g:"+group+" delete";
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
index 4d44d40da..9b3bc3679 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
@@ -22,7 +22,9 @@ public class Commandmangdeli extends EssentialsCommand
 		}
 		final String target = args[0];
 		final String group = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+target+" parents remove "+group+"");
+		String command = "/permissions g:"+target+" parents remove "+group;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
index 6887221b4..de4ce8a7e 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
@@ -22,7 +22,9 @@ public class Commandmangdelp extends EssentialsCommand
 		}
 		final String target = args[0];
 		final String perm = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+target+" perms remove "+perm+"");
+		String command = "/permissions g:"+target+" perms remove "+perm;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
index 190466cd7..2e775c147 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
@@ -21,7 +21,9 @@ public class Commandmanglistp extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		final String target = args[0];
-		ess.getServer().dispatchCommand(sender, "/permissions g:"+target+" perms list");
+		String command = "/permissions g:"+target+" perms list";
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
index d275f90f2..3e1803233 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
@@ -21,8 +21,9 @@ public class Commandmanload extends EssentialsCommand
 		{
 			world = args[0];
 		}
-                
-		ess.getServer().dispatchCommand(sender, "/permissions -reload "+world+"");
+		String command = "/permissions -reload "+world;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
index 3f35b74bc..65a4df759 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
@@ -23,7 +23,9 @@ public class Commandmanuadd extends EssentialsCommand
 		final String player = args[0];
 		final String group = args[1];
                 //TODO: Make this command add a player if it doesnt exist /permissions +player+ create
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" parents add "+group+"");
+		String command = "/permissions "+player+" parents add "+group;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
index 0a878af19..676631c63 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
@@ -22,7 +22,9 @@ public class Commandmanuaddp extends EssentialsCommand
 		}
 		final String player = args[0];
 		final String perm = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" perms add "+perm+"");
+		String command = "/permissions "+player+" perms add "+perm;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
index 9c730a53b..ee2cd3147 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
@@ -22,7 +22,9 @@ public class Commandmanuaddsub extends EssentialsCommand
 		}
 		final String player = args[0];
 		final String group = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" parents add "+group+"");
+		String command = "/permissions "+player+" parents add "+group;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
index 2a4bc6548..df713fc31 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
@@ -22,7 +22,9 @@ public class Commandmanucheckp extends EssentialsCommand
 		}
 		final String player = args[0];
 		final String perm = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" has "+perm+"");
+		String command = "/permissions "+player+" has "+perm;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
index 39f0867ce..9e117ac21 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
@@ -21,7 +21,9 @@ public class Commandmanudel extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		final String player = args[0];
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" delete");
+		String command = "/permissions "+player+" delete";
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
index 229e33d22..4a35f628b 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
@@ -22,7 +22,9 @@ public class Commandmanudelp extends EssentialsCommand
 		}
 		final String player = args[0];
 		final String perm = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" perms remove "+perm+"");
+		String command = "/permissions "+player+" perms remove "+perm;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
index f009a78d9..4640c68b1 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
@@ -22,7 +22,9 @@ public class Commandmanudelsub extends EssentialsCommand
 		}
 		final String player = args[0];
 		final String group = args[1];
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" parents remove "+group+"");
+		String command = "/permissions "+player+" parents remove "+group;
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
index 37f11b985..f5d4a484e 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
@@ -21,7 +21,9 @@ public class Commandmanulistp extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		final String player = args[0];
-		ess.getServer().dispatchCommand(sender, "/permissions "+player+" perms list");
+		String command = "/permissions "+player+" perms list";
+		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
+		ess.getServer().dispatchCommand(sender, command);
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/plugin.yml b/EssentialsPermissionsCommands/src/plugin.yml
index 54425b716..a13023a5c 100644
--- a/EssentialsPermissionsCommands/src/plugin.yml
+++ b/EssentialsPermissionsCommands/src/plugin.yml
@@ -103,7 +103,7 @@ commands:
   mangcheckv:
     description: Verify a value of a variable of group, and where it comes from.
     usage: /<command> <group> <variable>
-    permission: groupmanager.mangckeckv
+    permission: groupmanager.mangcheckv
   manwhois:
     description: Tell the group that user belongs.
     usage: /<command> <player>
@@ -163,4 +163,4 @@ commands:
   manclear:
     description: Clear world selection. Next commands will work on your world.
     usage: /<command>
-    permission: groupmanager.manclear
\ No newline at end of file
+    permission: groupmanager.manclear