Complete the transition to maven :D

2 files changed, 21 insertions, 11 deletions

diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
index 6187d9ab8..0f17e8660 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
@@ -1,21 +1,25 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.EssentialsConf;
 import com.earth2me.essentials.api.IReload;
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 
 public class UserManager implements IReload
 {
-	private final transient EssentialsConf users;
+	private transient YamlConfiguration users;
+	private final transient File folder;
 	private final transient List<String> spyusers = new ArrayList<String>();
 	private final static String ADDRESS = "address";
 	private final static String SPY = "spy";
 
 	public UserManager(final File folder)
 	{
-		users = new EssentialsConf(new File(folder, "users.yml"));
+		this.folder = folder;
 		onReload();
 	}
 
@@ -63,15 +67,22 @@ public class UserManager implements IReload
 		final Map<String, Object> userdata = new HashMap<String, Object>();
 		userdata.put(ADDRESS, address);
 		userdata.put(SPY, spy);
-		users.setProperty(username, userdata);
-		users.save();
+		users.set(username, userdata);
+		try
+		{
+			users.save(new File(folder, "users.yml"));
+		}
+		catch (IOException ex)
+		{
+			Logger.getLogger(UserManager.class.getName()).log(Level.SEVERE, null, ex);
+		}
 		onReload();
 	}
 
 	@Override
 	public final void onReload()
 	{
-		users.load();
+		users = YamlConfiguration.loadConfiguration(new File(folder, "users.yml"));
 		spyusers.clear();
 		final Set<String> keys = users.getKeys(false);
 		for (String key : keys)
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index 67109b461..64dd5aff2 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -1,6 +1,5 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.EssentialsConf;
 import com.earth2me.essentials.api.IReload;
 import com.earth2me.essentials.api.IUser;
 import java.io.File;
@@ -9,6 +8,7 @@ import java.util.logging.Handler;
 import java.util.logging.Level;
 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.*;
@@ -20,7 +20,7 @@ import org.jivesoftware.smack.util.StringUtils;
 public class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IReload
 {
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient EssentialsConf config;
+	private transient YamlConfiguration config = null;
 	private transient XMPPConnection connection;
 	private transient ChatManager chatManager;
 	private final transient Map<String, Chat> chats = Collections.synchronizedMap(new HashMap<String, Chat>());
@@ -36,8 +36,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
 	{
 		super();
 		this.parent = parent;
-		config = new EssentialsConf(new File(parent.getDataFolder(), "config.yml"));
-		config.setTemplateName("/config.yml", EssentialsXMPP.class);
+		// config.setTemplateName("/config.yml", EssentialsXMPP.class);
 		onReload();
 	}
 
@@ -168,7 +167,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
 	public final void onReload()
 	{
 		LOGGER.removeHandler(this);
-		config.load();
+		config = YamlConfiguration.loadConfiguration(new File(parent.getDataFolder(), "config.yml"));
 		synchronized (chats)
 		{
 			disconnect();