diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-12-01 13:47:06 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-12-01 13:47:06 +0000 |
commit | f0069326393cc145c0fd21e002a8eaac1a9681d8 (patch) | |
tree | 5a22fd2e93ef9a85643e1da860a91dab493e2468 /EssentialsPermissionsCommands/src/com | |
parent | 2dc6f8c20236dfa76b09bd4bd9e522cd0d1c354b (diff) | |
parent | 39851694ad9e55e425ff7cb03c05cdb70a16f5a4 (diff) | |
download | Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.gz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.lz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.tar.xz Essentials-f0069326393cc145c0fd21e002a8eaac1a9681d8.zip |
Merge branch 'master' of github.com:essentials/Essentials
Conflicts:
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
Diffstat (limited to 'EssentialsPermissionsCommands/src/com')
18 files changed, 0 insertions, 579 deletions
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java deleted file mode 100644 index 8c22dabdc..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmangadd extends EssentialsCommand -{ - public Commandmangadd() - { - super("mangadd"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 1) - { - throw new NotEnoughArgumentsException(); - } - final String group = args[0]; - 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 deleted file mode 100644 index 760b5c81f..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmangaddi extends EssentialsCommand -{ - public Commandmangaddi() - { - super("mangaddi"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String target = args[0]; - final String group = args[1]; - 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 deleted file mode 100644 index e83de4e50..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmangaddp extends EssentialsCommand -{ - public Commandmangaddp() - { - super("mangaddp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String target = args[0]; - final String perm = args[1]; - 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 deleted file mode 100644 index 1152d1a0b..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmangcheckp extends EssentialsCommand -{ - public Commandmangcheckp() - { - super("mangcheckp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String target = args[0]; - final String perm = args[1]; - 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 deleted file mode 100644 index 24ffe2307..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmangdel extends EssentialsCommand -{ - public Commandmangdel() - { - super("mangdel"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 1) - { - throw new NotEnoughArgumentsException(); - } - final String group = args[0]; - 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 deleted file mode 100644 index aea296735..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmangdeli extends EssentialsCommand -{ - public Commandmangdeli() - { - super("mangdeli"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String target = args[0]; - final String group = args[1]; - 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 deleted file mode 100644 index ef1dd4207..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmangdelp extends EssentialsCommand -{ - public Commandmangdelp() - { - super("mangdelp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String target = args[0]; - final String perm = args[1]; - 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 deleted file mode 100644 index 715f42774..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanglistp extends EssentialsCommand -{ - public Commandmanglistp() - { - super("manglistp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 1) - { - throw new NotEnoughArgumentsException(); - } - final String target = args[0]; - 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 deleted file mode 100644 index 390cb78eb..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanload extends EssentialsCommand -{ - public Commandmanload() - { - super("manload"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - String world = "all"; - if (args.length > 1) - { - world = args[0]; - } - 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 deleted file mode 100644 index a63a1a36b..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanuadd extends EssentialsCommand -{ - public Commandmanuadd() - { - super("manuadd"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - final String group = args[1]; - //TODO: Make this command add a player if it doesnt exist /permissions +player+ create - 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 deleted file mode 100644 index 3d3d67c72..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanuaddp extends EssentialsCommand -{ - public Commandmanuaddp() - { - super("manuaddp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - final String perm = args[1]; - 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 deleted file mode 100644 index 60d1980af..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanuaddsub extends EssentialsCommand -{ - public Commandmanuaddsub() - { - super("manuaddsub"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - final String group = args[1]; - 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 deleted file mode 100644 index 634b447c7..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanucheckp extends EssentialsCommand -{ - public Commandmanucheckp() - { - super("manucheckp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - final String perm = args[1]; - 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 deleted file mode 100644 index 72c8fc2af..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanudel extends EssentialsCommand -{ - public Commandmanudel() - { - super("manudel"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 1) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - 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 deleted file mode 100644 index 01adf97b2..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanudelp extends EssentialsCommand -{ - public Commandmanudelp() - { - super("manudelp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - final String perm = args[1]; - 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 deleted file mode 100644 index 1a1ae2a6d..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanudelsub extends EssentialsCommand -{ - public Commandmanudelsub() - { - super("manudelsub"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 2) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - final String group = args[1]; - 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 deleted file mode 100644 index f809f3c61..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; - - -public class Commandmanulistp extends EssentialsCommand -{ - public Commandmanulistp() - { - super("manulistp"); - } - - @Override - protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 1) - { - throw new NotEnoughArgumentsException(); - } - final String player = args[0]; - String command = "permissions "+player+" perms list"; - sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead."); - ess.getServer().dispatchCommand(sender, command); - } - - -} diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java deleted file mode 100644 index 14e9a117c..000000000 --- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.earth2me.essentials.permissions; - -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.Util; -import com.nijiko.permissions.PermissionHandler; -import com.nijikokun.bukkit.Permissions.Permissions; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; - - -public class EssentialsPermissionsCommands extends JavaPlugin -{ - private static PermissionHandler permissionHandler = null; - private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private IEssentials ess; - - public static PermissionHandler getPermissionHandler() - { - return permissionHandler; - } - - @Override - public void onEnable() - { - final PluginManager pluginManager = getServer().getPluginManager(); - final Plugin permissionsPlugin = pluginManager.getPlugin("Permissions"); - - if (permissionsPlugin != null - && permissionsPlugin.getDescription().getVersion().charAt(0) == '3') - { - permissionHandler = ((Permissions)permissionsPlugin).getHandler(); - } - ess = (IEssentials)pluginManager.getPlugin("Essentials"); - - if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, Util.i18n("versionMismatchAll")); - } - LOGGER.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team")); - - } - - @Override - public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) - { - return ess.onCommandEssentials(sender, command, label, args, EssentialsPermissionsCommands.class.getClassLoader(), "com.earth2me.essentials.permissions.Command", "groupmanager."); - } - - @Override - public void onDisable() - { - } -} |