diff options
author | ementalo <ementalodev@gmx.co.uk> | 2012-07-17 12:26:55 +0100 |
---|---|---|
committer | ementalo <ementalodev@gmx.co.uk> | 2012-07-17 14:21:03 +0100 |
commit | a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3 (patch) | |
tree | 2aa10b6300f6c8d3cb2b298c124180fade74857a /EssentialsXMPP/src | |
parent | 3c385e69271dfe8530fadc3f67e13ee495e4b0e1 (diff) | |
parent | 9f05e43ecf8e6e1a8fcaef757678e762f0d82573 (diff) | |
download | Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.gz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.lz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.xz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.zip |
Merge of server-layer branch
Diffstat (limited to 'EssentialsXMPP/src')
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/Commandsetxmpp.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java) | 2 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java) | 2 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java) | 4 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java) | 10 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java) | 2 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java) | 2 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/UserManager.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java) | 2 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java) | 13 | ||||
-rw-r--r-- | EssentialsXMPP/src/plugin.yml | 4 |
9 files changed, 21 insertions, 20 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandsetxmpp.java index bc4ef0b6c..57bee3b58 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandsetxmpp.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; import net.ess3.api.IUser; import net.ess3.commands.EssentialsCommand; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java index 0a5b41218..88e1d9810 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; import net.ess3.Console; import net.ess3.commands.EssentialsCommand; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java index 392e20d5c..dcace3b7d 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; import net.ess3.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException; @@ -37,4 +37,4 @@ public class Commandxmppspy extends EssentialsCommand } } } -}
\ No newline at end of file +} diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java index e4727d8a5..74ab09fd5 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; -import net.ess3.commands.EssentialsCommandHandler; import static net.ess3.I18n._; import net.ess3.api.ICommandHandler; import net.ess3.api.IEssentials; import net.ess3.api.IUser; +import net.ess3.commands.EssentialsCommandHandler; import java.util.List; import java.util.Locale; import java.util.logging.Level; @@ -36,7 +36,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP instance = this; final PluginManager pluginManager = getServer().getPluginManager(); - ess = (IEssentials)pluginManager.getPlugin("Essentials3"); + ess = (IEssentials)pluginManager.getPlugin("Essentials-3"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { LOGGER.log(Level.WARNING, _("versionMismatchAll")); @@ -55,8 +55,8 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP ess.addReloadListener(users); ess.addReloadListener(xmpp); - - commandHandler = new EssentialsCommandHandler(EssentialsXMPP.class.getClassLoader(), "com.earth2me.essentials.xmpp.Command", "essentials.", ess); + + commandHandler = new EssentialsCommandHandler(EssentialsXMPP.class.getClassLoader(), "net.ess3.xmpp.Command", "essentials.", ess); } @Override diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java index 2d454deb1..4880aead7 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; import net.ess3.api.IEssentials; import net.ess3.api.IUser; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java index df329156d..373a7879d 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; import net.ess3.api.IUser; import java.util.List; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java index 44ad39d2d..a2018c006 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; import net.ess3.api.IReload; import java.io.File; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java index d4fb64756..ff49bc931 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java @@ -1,7 +1,8 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; import net.ess3.api.IReload; import net.ess3.api.IUser; +import net.ess3.utils.Util; import java.io.File; import java.util.*; import java.util.logging.Handler; @@ -10,14 +11,14 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; -import org.jivesoftware.smack.Roster.SubscriptionMode; import org.jivesoftware.smack.*; +import org.jivesoftware.smack.Roster.SubscriptionMode; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.util.StringUtils; -public class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IReload +public final class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IReload { private static final Logger LOGGER = Logger.getLogger("Minecraft"); private transient YamlConfiguration config = null; @@ -59,7 +60,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager disconnect(); connect(); } - chat.sendMessage(message.replaceAll("ยง[0-9a-f]", "")); + chat.sendMessage(Util.stripFormat(message)); return true; } } @@ -131,7 +132,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager } } - public final void disconnect() + public void disconnect() { if (loggerThread != null) { @@ -164,7 +165,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager } @Override - public final void onReload() + public void onReload() { LOGGER.removeHandler(this); config = YamlConfiguration.loadConfiguration(new File(parent.getDataFolder(), "config.yml")); diff --git a/EssentialsXMPP/src/plugin.yml b/EssentialsXMPP/src/plugin.yml index 7109284b7..49f6abd98 100644 --- a/EssentialsXMPP/src/plugin.yml +++ b/EssentialsXMPP/src/plugin.yml @@ -1,13 +1,13 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsXMPP -main: com.earth2me.essentials.xmpp.EssentialsXMPP +main: net.ess3.xmpp.EssentialsXMPP # Note to developers: This next line cannot change, or the automatic versioning system will break. version: ${build.number} website: http://tiny.cc/EssentialsWiki description: Provides xmpp communication. authors: - snowleo -depend: [Essentials3] +depend: [Essentials-3] commands: setxmpp: description: set your xmpp address |