From 50ab5ffd935ee10f0a42d7aabcce6d438cf57dcb Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 26 Aug 2012 20:17:29 +0200 Subject: Removing server layer part 2 --- EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java | 3 ++- EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java | 1 + EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java | 17 +++++++++-------- .../src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java | 9 +++------ EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java | 9 +++++---- EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) (limited to 'EssentialsXMPP/src') diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java index 0881aa706..d48f60e7d 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java @@ -3,6 +3,7 @@ package net.ess3.xmpp; import net.ess3.Console; import net.ess3.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -24,7 +25,7 @@ public class Commandxmpp extends EssentialsCommand else { final String message = getFinalArg(args, 1); - final String senderName = sender instanceof Player ? ess.getUserMap().getUser((Player)sender).getDisplayName() : Console.NAME; + final String senderName = isUser(sender) ? getPlayer(sender).getDisplayName() : Console.NAME; sender.sendMessage("[" + senderName + ">" + address + "] " + message); if (!EssentialsXMPP.getInstance().sendMessage(address, "[" + senderName + "] " + message)) { diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java index dcace3b7d..2fee4bbfd 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java @@ -4,6 +4,7 @@ import net.ess3.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException; import java.util.List; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java index f62f3c3f5..849aa4331 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; +import net.ess3.api.IPlugin; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -36,12 +36,13 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP instance = this; final PluginManager pluginManager = getServer().getPluginManager(); - ess = (IEssentials)pluginManager.getPlugin("Essentials-3"); - if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) + final IPlugin plugin = (IPlugin)pluginManager.getPlugin("Essentials-3"); + ess = plugin.getEssentials(); + if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion())) { LOGGER.log(Level.WARNING, _("versionMismatchAll")); } - if (!ess.isEnabled()) + if (!plugin.isEnabled()) { this.setEnabled(false); return; @@ -76,7 +77,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP } @Override - public void setAddress(final Player user, final String address) + public void setAddress(final CommandSender user, final String address) { final String username = user.getName().toLowerCase(Locale.ENGLISH); instance.users.setAddress(username, address); @@ -96,7 +97,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP } @Override - public boolean toggleSpy(final Player user) + public boolean toggleSpy(final CommandSender user) { final String username = user.getName().toLowerCase(Locale.ENGLISH); final boolean spy = !instance.users.isSpy(username); @@ -105,13 +106,13 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP } @Override - public String getAddress(final Player user) + public String getAddress(final CommandSender user) { return instance.users.getAddress(user.getName()); } @Override - public boolean sendMessage(final Player user, final String message) + public boolean sendMessage(final CommandSender user, final String message) { return instance.xmpp.sendMessage(instance.users.getAddress(user.getName()), message); } diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java index de8a62405..4824f03db 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java @@ -23,22 +23,19 @@ class EssentialsXMPPPlayerListener implements Listener @EventHandler(priority= EventPriority.MONITOR) public void onPlayerJoin(final PlayerJoinEvent event) { - final IUser user = ess.getUserMap().getUser(event.getPlayer()); - sendMessageToSpyUsers("Player " + user.getDisplayName() + " joined the game"); + sendMessageToSpyUsers("Player " + event.getPlayer().getDisplayName() + " joined the game"); } @EventHandler(priority= EventPriority.MONITOR) public void onPlayerChat(final PlayerChatEvent event) { - final IUser user = ess.getUserMap().getUser(event.getPlayer()); - sendMessageToSpyUsers(String.format(event.getFormat(), user.getDisplayName(), event.getMessage())); + sendMessageToSpyUsers(String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage())); } @EventHandler(priority= EventPriority.MONITOR) public void onPlayerQuit(final PlayerQuitEvent event) { - final IUser user = ess.getUserMap().getUser(event.getPlayer()); - sendMessageToSpyUsers("Player " + user.getDisplayName() + " left the game"); + sendMessageToSpyUsers("Player " + event.getPlayer().getDisplayName() + " left the game"); } private void sendMessageToSpyUsers(final String message) diff --git a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java index 373a7879d..14fea2c78 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java @@ -2,13 +2,14 @@ package net.ess3.xmpp; import net.ess3.api.IUser; import java.util.List; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; public interface IEssentialsXMPP extends Plugin { - String getAddress(final Player user); + String getAddress(final CommandSender user); String getAddress(final String name); @@ -16,13 +17,13 @@ public interface IEssentialsXMPP extends Plugin IUser getUserByAddress(final String address); - boolean sendMessage(final Player user, final String message); + boolean sendMessage(final CommandSender user, final String message); boolean sendMessage(final String address, final String message); - void setAddress(final Player user, final String address); + void setAddress(final CommandSender user, final String address); - boolean toggleSpy(final Player user); + boolean toggleSpy(final CommandSender user); void broadcastMessage(final IUser sender, final String message, final String xmppAddress); } diff --git a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java index ff49bc931..584cf3f21 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java @@ -90,7 +90,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM break; default: final IUser sender = parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())); - parent.broadcastMessage(sender, "=" + sender.getDisplayName() + ": " + message, StringUtils.parseBareAddress(chat.getParticipant())); + parent.broadcastMessage(sender, "=" + sender.getName() + ": " + message, StringUtils.parseBareAddress(chat.getParticipant())); } } } -- cgit v1.2.3