From c80849b124c16ebc9c4ef84e4e9fe8a7611f0cb5 Mon Sep 17 00:00:00 2001 From: Peter Eliot Date: Sat, 17 Dec 2011 03:44:40 -0700 Subject: [PATCH] First Commit --- .DS_Store | Bin 0 -> 6148 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/org/bukkitmon/BMMob.java | 12 +- src/org/bukkitmon/BMPListener.java | 164 ++++++++++++------------- src/org/bukkitmon/BukkitMon.java | 18 ++- src/org/toi/bukkitmon/BMMob.java | 18 ++- src/org/toi/bukkitmon/BMPListener.java | 83 +++++++------ src/org/toi/bukkitmon/BukkitMon.java | 41 ++++++- src/plugin.yml | 8 +- 9 files changed, 203 insertions(+), 141 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8132a4f4799de7809fbf8d1d16953631b200d8be GIT binary patch literal 6148 zcmeH~K}*9h6vq=cwW2~VqQ~HQ$aKPX@KDMGk3t7KIMLRME0lJ$ojcTOJ^5|?IDQ`A zOJ2e0&LZ+2B>$JZm!$bYn??vB-FbK{ge`=yprA^0Rv31#46RWzs>C_+SrDfIwBCam z#s0eBv$sSpGI19yzCM2(^E!g z@aXJf zX>HUD7gDbb^U%u8C_+c@U=owBCa` z#s0eBv$sVmGBFL7U!OmY@}k%KkgaxSV{^*_+r61YNtiC(bdiMlwKq$bUKBnAes-(< z!Y>xN>t{N0J&D3%c4r@y<#5pNs^MwXRpnsN>#DQ^E!w z==l6{?3Yi~^NWEffw8td(nemvp*=i$SrVto6ndKMCX1B`FaajO1eky!KqrK?!$6n- z6JP@02;lcYK|ys$Yoq$p0Tuo}W4wck20q>;P!*{|S{sE3m^4E{%}_~K3~7c#zoI;c zv^Hvn3#nIzd1&S4@*?%>(64m5kd9HVnE(@5CD1la8_)j>cxBdJ@>hp&iwQ7+e?~xd zM&8JUP0`u Watch out! " + ChatColor.YELLOW + player.getDisplayName() + " spawned " + event.getNumHatches() + " " + event.getHatchType().getName() + "s"); @@ -51,105 +51,103 @@ public void onPlayerEggThrow(PlayerEggThrowEvent event) event.setHatching(false); } - public void onPlayerCommand(PlayerChatEvent event) + public boolean onPlayerCommand(Player player, String[] split) { - Player player = event.getPlayer(); - String[] split = event.getMessage().split(" "); - if (split[0].equalsIgnoreCase("/bm")) + //Player player = event.getPlayer(); + //String[] split = event.getMessage().split(" "); + if (split.length >= 1) { - if (split.length >= 2) + if (!ph.containsKey(player.getName())) + ph.put(player.getName(), new BMMob()); + BMMob bm = ph.get(player.getName()); + if (split[0].equalsIgnoreCase("mobs") && this.perms.canPlayerUseCommand(player.getName(), "mobs")) { - if (!ph.containsKey(player.getName())) - ph.put(player.getName(), new BMMob()); - BMMob bm = ph.get(player.getName()); - if (split[1].equalsIgnoreCase("mobs") && this.perms.canPlayerUseCommand(player.getName(), "mobs")) - { - if (split.length >= 3) - { - try{ - byte val = Byte.valueOf(split[2]); - if (val <= bm.getMaxAmount()) - { - bm.setNrOfMobs(val); - player.sendMessage(this.bmStr + "You set the number of mobs to spawn to: " + val); - } - else - player.sendMessage(this.bmStr + val + " is more than the max amount"); - } - catch (NumberFormatException nfe){ - player.sendMessage(this.bmStr + "You need to define a valid number"); - } - } - else - player.sendMessage(this.bmStr + "You need to define a number"); - } - else if (split[1].equalsIgnoreCase("mobtype") && this.perms.canPlayerUseCommand(player.getName(), "mobtype")) + if (split.length >= 2) { - if (split.length >= 3) - { - MobType mt = MobType.valueOf(split[2].toUpperCase()); - if (mt != null) + try{ + byte val = Byte.valueOf(split[1]); + if (val <= bm.getMaxAmount()) { - bm.setMobtype(mt); - player.sendMessage(this.bmStr + "You set the mob type to " + split[2]); + bm.setNrOfMobs(val); + player.sendMessage(this.bmStr + "You set the number of mobs to spawn to: " + val); } else - player.sendMessage(this.bmStr + "Invalid mobtype!"); + player.sendMessage(this.bmStr + val + " is more than the max amount"); + } + catch (NumberFormatException nfe){ + player.sendMessage(this.bmStr + "You need to define a valid number"); } - else - player.sendMessage(this.bmStr + "You need to define a mobtype"); - } - else if (split[1].equalsIgnoreCase("randomamount") && this.perms.canPlayerUseCommand(player.getName(), "randomamount")) - { - bm.setRndAmount(!bm.isRndAmount()); - player.sendMessage(this.bmStr + "You set random amount to " + bm.isRndAmount()); - } - else if (split[1].equalsIgnoreCase("randommob") && this.perms.canPlayerUseCommand(player.getName(), "randommob")) - { - bm.setRndAmount(!bm.isRndAmount()); - player.sendMessage(this.bmStr + "You set randommob to " + bm.isRndAmount()); } - else if (split[1].equalsIgnoreCase("maxamount") && this.perms.canPlayerUseCommand(player.getName(), "maxamount")) + else + player.sendMessage(this.bmStr + "You need to define a number"); + } + else if (split[0].equalsIgnoreCase("CreatureType") && this.perms.canPlayerUseCommand(player.getName(), "CreatureType")) + { + if (split.length >= 2) { - if (split.length >= 3) + CreatureType mt = CreatureType.valueOf(split[1].toUpperCase()); + if (mt != null) { - try{ - byte val = Byte.valueOf(split[2]); - bm.setMaxAmount(val); - player.sendMessage(this.bmStr + "You set the max amount of mobs to spawn to: " + val); - } - catch (NumberFormatException nfe){ - player.sendMessage(this.bmStr + "You need to define a valid number"); - } + bm.setCreatureType(mt); + player.sendMessage(this.bmStr + "You set the mob type to " + split[1]); } else - player.sendMessage(this.bmStr + "You need to define a number"); + player.sendMessage(this.bmStr + "Invalid CreatureType!"); } - else if (split[1].equalsIgnoreCase("activate") && this.perms.canPlayerUseCommand(player.getName(), "activate")) - { - bm.setActive(!bm.isActive()); - if (bm.isActive()) - player.sendMessage(this.bmStr + "You activated BukkitMon"); - else - player.sendMessage(this.bmStr + "You deactivated BukkitMon"); - - } - else if (split[1].equalsIgnoreCase("list") && this.perms.canPlayerUseCommand(player.getName(), "list")) + else + player.sendMessage(this.bmStr + "You need to define a CreatureType"); + } + else if (split[0].equalsIgnoreCase("randomamount") && this.perms.canPlayerUseCommand(player.getName(), "randomamount")) + { + bm.setRndAmount(!bm.isRndAmount()); + player.sendMessage(this.bmStr + "You set random amount to " + bm.isRndAmount()); + } + else if (split[0].equalsIgnoreCase("randommob") && this.perms.canPlayerUseCommand(player.getName(), "randommob")) + { + bm.setRndAmount(!bm.isRndAmount()); + player.sendMessage(this.bmStr + "You set randommob to " + bm.isRndAmount()); + } + else if (split[0].equalsIgnoreCase("maxamount") && this.perms.canPlayerUseCommand(player.getName(), "maxamount")) + { + if (split.length >= 2) { - player.sendMessage(ChatColor.RED + "BukkitMon commands:"); - player.sendMessage(ChatColor.RED + "/bm mobs [#]" + ChatColor.YELLOW + " - Define how many mobs to spawn"); - player.sendMessage(ChatColor.RED + "/bm mobtype [type]" + ChatColor.YELLOW + " - Define the mobtype to spawn"); - player.sendMessage(ChatColor.RED + "/bm maxamount" + ChatColor.YELLOW + " - Defines the max amount of mobs you can spawn"); - player.sendMessage(ChatColor.RED + "/bm randomamount" + ChatColor.YELLOW + " - Toggle random amount on/off"); - player.sendMessage(ChatColor.RED + "/bm randommob" + ChatColor.YELLOW + " - Toggle random mob type on/off"); - player.sendMessage(ChatColor.RED + "/bm activate" + ChatColor.YELLOW + " - Activates the BukkitMon eggs"); - player.sendMessage(ChatColor.RED + "/bm list" + ChatColor.YELLOW + " - Shows a list of avaliable BukkitMon commands"); + try{ + byte val = Byte.valueOf(split[1]); + bm.setMaxAmount(val); + player.sendMessage(this.bmStr + "You set the max amount of mobs to spawn to: " + val); + } + catch (NumberFormatException nfe){ + player.sendMessage(this.bmStr + "You need to define a valid number"); + } } else - player.sendMessage(this.bmStr + "Unknown BukkitMon command"); + player.sendMessage(this.bmStr + "You need to define a number"); + } + else if (split[0].equalsIgnoreCase("activate") && this.perms.canPlayerUseCommand(player.getName(), "activate")) + { + bm.setActive(!bm.isActive()); + if (bm.isActive()) + player.sendMessage(this.bmStr + "You activated BukkitMon"); + else + player.sendMessage(this.bmStr + "You deactivated BukkitMon"); + + } + else if (split[0].equalsIgnoreCase("list") && this.perms.canPlayerUseCommand(player.getName(), "list")) + { + player.sendMessage(ChatColor.RED + "BukkitMon commands:"); + player.sendMessage(ChatColor.RED + "/bm mobs [#]" + ChatColor.YELLOW + " - Define how many mobs to spawn"); + player.sendMessage(ChatColor.RED + "/bm CreatureType [type]" + ChatColor.YELLOW + " - Define the CreatureType to spawn"); + player.sendMessage(ChatColor.RED + "/bm maxamount" + ChatColor.YELLOW + " - Defines the max amount of mobs you can spawn"); + player.sendMessage(ChatColor.RED + "/bm randomamount" + ChatColor.YELLOW + " - Toggle random amount on/off"); + player.sendMessage(ChatColor.RED + "/bm randommob" + ChatColor.YELLOW + " - Toggle random mob type on/off"); + player.sendMessage(ChatColor.RED + "/bm activate" + ChatColor.YELLOW + " - Activates the BukkitMon eggs"); + player.sendMessage(ChatColor.RED + "/bm list" + ChatColor.YELLOW + " - Shows a list of avaliable BukkitMon commands"); } else - player.sendMessage(this.bmStr + "Define a function please!"); + player.sendMessage(this.bmStr + "Unknown BukkitMon command"); } + else + player.sendMessage(this.bmStr + "Define a function please!"); + return true; } } diff --git a/src/org/bukkitmon/BukkitMon.java b/src/org/bukkitmon/BukkitMon.java index 691e6e4..2096276 100644 --- a/src/org/bukkitmon/BukkitMon.java +++ b/src/org/bukkitmon/BukkitMon.java @@ -4,6 +4,9 @@ import java.util.logging.Logger; import org.bukkit.Server; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.Event.Priority; import org.bukkit.plugin.PluginDescriptionFile; @@ -21,7 +24,8 @@ public class BukkitMon extends JavaPlugin{ public BukkitMon(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) { - super(pluginLoader, instance, desc, folder, plugin, cLoader); + super(); + initialize(pluginLoader, instance, desc, folder, plugin, cLoader); this.registerEvents(); this.addCommands(); this.perms.loadPermissions(); @@ -50,7 +54,17 @@ public void addCommands() public void registerEvents() { getServer().getPluginManager().registerEvent(Event.Type.PLAYER_EGG_THROW, playerListener, Priority.Normal, this); - getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this); + //getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this); + } + + public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args){ + Player player=(Player) sender; + if (cmd.getName().equalsIgnoreCase("/bm")) + { + playerListener.onPlayerCommand(player, args); + return true; + } + return false; } } diff --git a/src/org/toi/bukkitmon/BMMob.java b/src/org/toi/bukkitmon/BMMob.java index d86369f..8ffa31e 100644 --- a/src/org/toi/bukkitmon/BMMob.java +++ b/src/org/toi/bukkitmon/BMMob.java @@ -1,11 +1,15 @@ package org.toi.bukkitmon; -import org.bukkit.entity.MobType; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.CreatureType; +import org.bukkit.entity.Player; public class BMMob { private byte nrOfMobs = 1; - private MobType mobtype = MobType.CHICKEN; + private CreatureType CreatureType = org.bukkit.entity.CreatureType.CHICKEN; private boolean rndAmount = false; private boolean rndType = false; private boolean active = true; @@ -40,12 +44,12 @@ public void setNrOfMobs(byte nrOfMobs) { this.nrOfMobs = nrOfMobs; } - public MobType getMobtype() { - return mobtype; + public CreatureType getCreatureType() { + return CreatureType; } - public void setMobtype(MobType mobtype) { - this.mobtype = mobtype; + public void setCreatureType(CreatureType CreatureType) { + this.CreatureType = CreatureType; } public boolean isActive() { @@ -64,4 +68,6 @@ public void setMaxAmount(byte maxAmount) { this.maxAmount = maxAmount; } + + } diff --git a/src/org/toi/bukkitmon/BMPListener.java b/src/org/toi/bukkitmon/BMPListener.java index 5a1a584..285b54c 100644 --- a/src/org/toi/bukkitmon/BMPListener.java +++ b/src/org/toi/bukkitmon/BMPListener.java @@ -6,9 +6,9 @@ import java.util.Random; import org.bukkit.ChatColor; -import org.bukkit.entity.MobType; +import org.bukkit.entity.CreatureType; import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerChatEvent; +//import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerEggThrowEvent; import org.bukkit.event.player.PlayerListener; import org.bukkit.plugin.Plugin; @@ -62,7 +62,7 @@ public void onPlayerEggThrow(PlayerEggThrowEvent event) BMMob bm = ph.get(player.getName()); if (bm.isActive()) { - MobType[] mts = MobType.values(); + CreatureType[] mts = CreatureType.values(); int rndint = rnd.nextInt(mts.length - 1); if (bm.isRndAmount()) event.setNumHatches((byte)rnd.nextInt(bm.getMaxAmount())); @@ -71,7 +71,7 @@ public void onPlayerEggThrow(PlayerEggThrowEvent event) if (bm.isRndType()) { int c = 0; - MobType mt = mts[rndint]; + CreatureType mt = mts[rndint]; while (this.randommobblacklist.contains(mt.getName().toLowerCase()) && c < mts.length) { mt = mts[rnd.nextInt(mts.length - 1)]; @@ -80,7 +80,7 @@ public void onPlayerEggThrow(PlayerEggThrowEvent event) event.setHatchType(mt); } else - event.setHatchType(bm.getMobtype()); + event.setHatchType(bm.getCreatureType()); event.setHatching(true); if (this.announce) { @@ -99,23 +99,25 @@ public void onPlayerEggThrow(PlayerEggThrowEvent event) event.setHatching(false); } - public void onPlayerCommand(PlayerChatEvent event) + public boolean onPlayerCommand(Player player, String[] split) { - Player player = event.getPlayer(); - String[] split = event.getMessage().split(" "); - if (split[0].equalsIgnoreCase("/bm")) - { - if (split.length >= 2) + //Player player = event.getPlayer(); + //String[] split = event.getMessage().split(" "); + //if (split[0].equalsIgnoreCase("/bm")) + //{ + if (split.length >= 1) { if (!ph.containsKey(player.getName())) ph.put(player.getName(), new BMMob()); BMMob bm = ph.get(player.getName()); - if (split[1].equalsIgnoreCase("mobs") && this.perms.canPlayerUseCommand(player.getName(), "mobs")) + player.sendMessage(""+this.perms.canPlayerUseCommand(player.getName(),"mobs")); + player.sendMessage(split[0]+"==mobs:"+split[0].equalsIgnoreCase("mobs")); + if (split[0].equalsIgnoreCase("mobs") && this.perms.canPlayerUseCommand(player.getName(), "mobs")) { - if (split.length >= 3) + if (split.length >= 2) { try{ - byte val = Byte.valueOf(split[2]); + byte val = Byte.valueOf(split[1]); if (val <= bm.getMaxAmount()) { bm.setNrOfMobs(val); @@ -131,43 +133,49 @@ public void onPlayerCommand(PlayerChatEvent event) else player.sendMessage(this.bmStr + "You need to define a number"); } - else if (split[1].equalsIgnoreCase("mobtype") && this.perms.canPlayerUseCommand(player.getName(), "mobtype")) + else if (split[0].equalsIgnoreCase("CreatureType") /*&& this.perms.canPlayerUseCommand(player.getName(), "CreatureType")*/) { - if (split.length >= 3) + if (split.length >= 2) { - MobType mt = MobType.valueOf(split[2].toUpperCase()); - if (mt != null) - { - if (!this.mobblacklist.contains(split[2].toLowerCase())) + try{ + CreatureType mt = CreatureType.valueOf(split[1].toUpperCase()); + if (mt != null) { - bm.setMobtype(mt); - player.sendMessage(this.bmStr + "You set the mob type to " + split[2]); + if (!this.mobblacklist.contains(split[1].toLowerCase())) + { + bm.setCreatureType(mt); + player.sendMessage(this.bmStr + "You set the mob type to " + split[1]); + } + else + player.sendMessage(this.bmStr + split[1] + " is not allowed!"); } else - player.sendMessage(this.bmStr + split[2] + " is not allowed!"); + player.sendMessage(this.bmStr + "Invalid CreatureType!"); + }catch(org.bukkit.command.CommandException E){ + player.sendMessage("The creature you specified is probably invalid.\n" + + "Usage: /bm creaturetype "); } - else - player.sendMessage(this.bmStr + "Invalid mobtype!"); + } else - player.sendMessage(this.bmStr + "You need to define a mobtype"); + player.sendMessage(this.bmStr + "You need to define a CreatureType"); } - else if (split[1].equalsIgnoreCase("randomamount") && this.perms.canPlayerUseCommand(player.getName(), "randomamount")) + else if (split[0].equalsIgnoreCase("randomamount") && this.perms.canPlayerUseCommand(player.getName(), "randomamount")) { bm.setRndAmount(!bm.isRndAmount()); player.sendMessage(this.bmStr + "You set random amount to " + bm.isRndAmount()); } - else if (split[1].equalsIgnoreCase("randomtype") && this.perms.canPlayerUseCommand(player.getName(), "randomtype")) + else if (split[0].equalsIgnoreCase("randomtype") && this.perms.canPlayerUseCommand(player.getName(), "randomtype")) { bm.setRndType(!bm.isRndType()); player.sendMessage(this.bmStr + "You set random type to " + bm.isRndType()); } - else if (split[1].equalsIgnoreCase("maxamount") && this.perms.canPlayerUseCommand(player.getName(), "maxamount")) + else if (split[0].equalsIgnoreCase("maxamount") && this.perms.canPlayerUseCommand(player.getName(), "maxamount")) { - if (split.length >= 3) + if (split.length >= 2) { try{ - byte val = Byte.valueOf(split[2]); + byte val = Byte.valueOf(split[1]); bm.setMaxAmount(val); player.sendMessage(this.bmStr + "You set the max amount of mobs to spawn to: " + val); } @@ -178,7 +186,7 @@ else if (split[1].equalsIgnoreCase("maxamount") && this.perms.canPlayerUseComman else player.sendMessage(this.bmStr + "You need to define a number"); } - else if (split[1].equalsIgnoreCase("activate") && this.perms.canPlayerUseCommand(player.getName(), "activate")) + else if (split[0].equalsIgnoreCase("activate") && this.perms.canPlayerUseCommand(player.getName(), "activate")) { bm.setActive(!bm.isActive()); if (bm.isActive()) @@ -187,11 +195,11 @@ else if (split[1].equalsIgnoreCase("activate") && this.perms.canPlayerUseCommand player.sendMessage(this.bmStr + "You deactivated BukkitMon"); } - else if ((split[1].equalsIgnoreCase("list") || split[1].equalsIgnoreCase("list")) && this.perms.canPlayerUseCommand(player.getName(), "list")) + else if ((split[0].equalsIgnoreCase("list") || split[0].equalsIgnoreCase("list")))// && this.perms.canPlayerUseCommand(player.getName(), "list")) { player.sendMessage(ChatColor.RED + "BukkitMon commands:"); player.sendMessage(ChatColor.RED + "/bm mobs [#]" + ChatColor.YELLOW + " - Define how many mobs to spawn"); - player.sendMessage(ChatColor.RED + "/bm mobtype [type]" + ChatColor.YELLOW + " - Define the mobtype to spawn"); + player.sendMessage(ChatColor.RED + "/bm CreatureType [type]" + ChatColor.YELLOW + " - Define the CreatureType to spawn"); player.sendMessage(ChatColor.RED + "/bm maxamount" + ChatColor.YELLOW + " - Defines the max amount of mobs you can spawn"); player.sendMessage(ChatColor.RED + "/bm randomamount" + ChatColor.YELLOW + " - Toggle random amount on/off"); player.sendMessage(ChatColor.RED + "/bm randomtype" + ChatColor.YELLOW + " - Toggle random mob type on/off"); @@ -199,10 +207,11 @@ else if ((split[1].equalsIgnoreCase("list") || split[1].equalsIgnoreCase("list") player.sendMessage(ChatColor.RED + "/bm list" + ChatColor.YELLOW + " - Shows a list of avaliable BukkitMon commands"); } else - player.sendMessage(this.bmStr + "Unknown BukkitMon command"); + player.sendMessage(this.bmStr + "Unknown BukkitMon command (or you don't have permission!)"); } else - player.sendMessage(this.bmStr + "Define a function please!"); - } + player.sendMessage("perms: "+this.perms.canPlayerUseCommand(player.getName(), "mobs")); + //} + return true; } } diff --git a/src/org/toi/bukkitmon/BukkitMon.java b/src/org/toi/bukkitmon/BukkitMon.java index 147e7e7..b0f5070 100644 --- a/src/org/toi/bukkitmon/BukkitMon.java +++ b/src/org/toi/bukkitmon/BukkitMon.java @@ -4,6 +4,9 @@ import java.util.logging.Logger; import org.bukkit.Server; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.Event.Priority; import org.bukkit.plugin.PluginDescriptionFile; @@ -21,23 +24,39 @@ public class BukkitMon extends JavaPlugin{ private tProperties props = new tProperties("BukkitMon" + File.separator + "bukkitmon.properties"); private final BMPListener playerListener = new BMPListener(this, perms, props); - public BukkitMon(PluginLoader pluginLoader, Server instance, + /*public BukkitMon(){ + super(); + this.registerEvents(); + + playerListener.loadConfig(); + this.addCommands(); + this.perms.loadPermissions(); + this.perms.savePermissions(); + }*/ + /*public BukkitMon(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) { - super(pluginLoader, instance, desc, folder, plugin, cLoader); - this.registerEvents(); + super(); + initialize(pluginLoader, instance, desc, folder, plugin, cLoader); playerListener.loadConfig(); this.addCommands(); this.perms.loadPermissions(); this.perms.savePermissions(); - } + }*/ public void onDisable() { log.info(name + " " + version + " disabled!"); } public void onEnable() { + this.registerEvents(); + + playerListener.loadConfig(); + this.addCommands(); + this.perms.loadPermissions(); + this.perms.savePermissions(); + log.info(name + " " + version + " enabled!"); } @@ -54,8 +73,18 @@ public void addCommands() public void registerEvents() { - getServer().getPluginManager().registerEvent(Event.Type.PLAYER_EGG_THROW, playerListener, Priority.Normal, this); - getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this); + this.getServer().getPluginManager().registerEvent(Event.Type.PLAYER_EGG_THROW, playerListener, Priority.Normal, this); + //getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this); + } + + public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args){ + Player player=(Player) sender; + if (cmd.getName().equalsIgnoreCase("bm")) + { + playerListener.onPlayerCommand(player, args); + return true; + } + return false; } } diff --git a/src/plugin.yml b/src/plugin.yml index 449ce39..e3c7951 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,3 +1,9 @@ name: BukkitMon main: org.toi.bukkitmon.BukkitMon -version: 0.1 \ No newline at end of file +version: 0.1 + +commands: + bm: + description: This is a test command + permission: LightBridge.test + usage: /bm stuff \ No newline at end of file