From 3781d660471cbd4199104212a0808d81b1912463 Mon Sep 17 00:00:00 2001 From: Ne0nx3r0 Date: Thu, 18 Jul 2013 13:14:58 -0500 Subject: [PATCH] Catching up to current version --- com/ne0nx3r0/betteralias/BetterAlias.java | 47 +++-- .../listener/BetterAliasCommandListener.java | 184 +++++++++--------- 2 files changed, 115 insertions(+), 116 deletions(-) diff --git a/com/ne0nx3r0/betteralias/BetterAlias.java b/com/ne0nx3r0/betteralias/BetterAlias.java index 32c1117..e7ac5d1 100644 --- a/com/ne0nx3r0/betteralias/BetterAlias.java +++ b/com/ne0nx3r0/betteralias/BetterAlias.java @@ -1,24 +1,23 @@ -package com.ne0nx3r0.betteralias; - -import com.ne0nx3r0.betteralias.alias.AliasManager; -import com.ne0nx3r0.betteralias.command.BetterAliasCommandExecutor; -import com.ne0nx3r0.betteralias.listener.BetterAliasCommandListener; -import org.bukkit.plugin.java.JavaPlugin; - -public class BetterAlias extends JavaPlugin -{ - public AliasManager aliasManager; - - @Override - public void onEnable() - { - this.aliasManager = new AliasManager(this); - - this.getServer().getPluginManager().registerEvents(new BetterAliasCommandListener(this), this); - - - BetterAliasCommandExecutor betterAliasCommandExecutor = new BetterAliasCommandExecutor(this); - - this.getCommand("bareload").setExecutor(betterAliasCommandExecutor); - } -} +package com.ne0nx3r0.betteralias; + +import com.ne0nx3r0.betteralias.alias.AliasManager; +import com.ne0nx3r0.betteralias.command.BetterAliasCommandExecutor; +import com.ne0nx3r0.betteralias.listener.BetterAliasCommandListener; +import org.bukkit.plugin.java.JavaPlugin; + +public class BetterAlias extends JavaPlugin +{ + public AliasManager aliasManager; + + @Override + public void onEnable() + { + this.aliasManager = new AliasManager(this); + + this.getServer().getPluginManager().registerEvents(new BetterAliasCommandListener(this), this); + + BetterAliasCommandExecutor betterAliasCommandExecutor = new BetterAliasCommandExecutor(this); + + this.getCommand("bareload").setExecutor(betterAliasCommandExecutor); + } +} diff --git a/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java b/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java index 3ff4ea0..03ca432 100644 --- a/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java +++ b/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java @@ -1,92 +1,92 @@ -package com.ne0nx3r0.betteralias.listener; - -import com.ne0nx3r0.betteralias.BetterAlias; -import com.ne0nx3r0.betteralias.alias.Alias; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.server.ServerCommandEvent; - -public class BetterAliasCommandListener implements Listener -{ - private final BetterAlias plugin; - - public BetterAliasCommandListener(BetterAlias plugin) - { - this.plugin = plugin; - } - - @EventHandler(priority = EventPriority.LOWEST) - public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent e) - { - String sCommand = null; - String sArgs = ""; - - if(e.getMessage().contains(" ")) - { - sCommand = e.getMessage().substring(1,e.getMessage().indexOf(" ")); - sArgs = e.getMessage().substring(e.getMessage().indexOf(" ")+1); - } - else - { - sCommand = e.getMessage().substring(1); - } - - Alias alias = plugin.aliasManager.getAlias(sCommand); - - if(alias != null) - { - Player player = e.getPlayer(); - - if(alias.hasPermission() - && !player.hasPermission("betteralias."+alias.getPermissionNode())) - { - player.sendMessage(ChatColor.RED+"You do not have permission to use this alias."); - - e.setCancelled(true); - } - else - { - if(plugin.aliasManager.sendAliasCommands( - alias, - (CommandSender) e.getPlayer(), - sArgs)); - { - e.setCancelled(true); - } - } - } - } - - @EventHandler(priority = EventPriority.LOWEST) - public void onConsoleCommand(ServerCommandEvent e) - { - Alias alias; - String sCommand = null; - - if(e.getCommand().contains(" ")) - { - sCommand = e.getCommand().substring(e.getCommand().indexOf(" ")+1); - - alias = plugin.aliasManager.getAlias(e.getCommand().substring(0,e.getCommand().indexOf(" "))); - } - else - { - alias = plugin.aliasManager.getAlias(e.getCommand()); - - sCommand = ""; - } - - if(alias != null) - { - if(plugin.aliasManager.sendAliasCommands(alias,e.getSender(),sCommand)) - { - e.setCommand("bareload donothing"); - } - } - } -} +package com.ne0nx3r0.betteralias.listener; + +import com.ne0nx3r0.betteralias.BetterAlias; +import com.ne0nx3r0.betteralias.alias.Alias; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.server.ServerCommandEvent; + +public class BetterAliasCommandListener implements Listener +{ + private final BetterAlias plugin; + + public BetterAliasCommandListener(BetterAlias plugin) + { + this.plugin = plugin; + } + + @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) + public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent e) + { + String sCommand = null; + String sArgs = ""; + + if(e.getMessage().contains(" ")) + { + sCommand = e.getMessage().substring(1,e.getMessage().indexOf(" ")); + sArgs = e.getMessage().substring(e.getMessage().indexOf(" ")+1); + } + else + { + sCommand = e.getMessage().substring(1); + } + + Alias alias = plugin.aliasManager.getAlias(sCommand); + + if(alias != null) + { + Player player = e.getPlayer(); + + if(alias.hasPermission() + && !player.hasPermission("betteralias."+alias.getPermissionNode())) + { + player.sendMessage(ChatColor.RED+"You do not have permission to use this alias."); + + e.setCancelled(true); + } + else + { + if(plugin.aliasManager.sendAliasCommands( + alias, + (CommandSender) e.getPlayer(), + sArgs)); + { + e.setCancelled(true); + } + } + } + } + + @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) + public void onConsoleCommand(ServerCommandEvent e) + { + Alias alias; + String sCommand = null; + + if(e.getCommand().contains(" ")) + { + sCommand = e.getCommand().substring(e.getCommand().indexOf(" ")+1); + + alias = plugin.aliasManager.getAlias(e.getCommand().substring(0,e.getCommand().indexOf(" "))); + } + else + { + alias = plugin.aliasManager.getAlias(e.getCommand()); + + sCommand = ""; + } + + if(alias != null) + { + if(plugin.aliasManager.sendAliasCommands(alias,e.getSender(),sCommand)) + { + e.setCommand("bareload donothing"); + } + } + } +}