diff --git a/pom.xml b/pom.xml
index 463b243..6efbaa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,11 @@
KraSocketClient
1.2-SNAPSHOT
+
+ earth.krakatoa
+ KraCore
+ 1.0-SNAPSHOT
+
diff --git a/src/main/java/net/krakatoaapi/KrakatoaAPI.java b/src/main/java/net/krakatoaapi/KrakatoaAPI.java
index a778701..9a1dc34 100644
--- a/src/main/java/net/krakatoaapi/KrakatoaAPI.java
+++ b/src/main/java/net/krakatoaapi/KrakatoaAPI.java
@@ -9,6 +9,10 @@ import earth.krakatao.protocol.KraSocketClientProtocol;
import earth.krakatao.protocol.KraSocketClientProtocolDest;
import earth.krakatao.protocol.KraSocketClientProtocolMessage;
import earth.krakatao.protocol.KraSocketClientProtocolStatus;
+import earth.krakatoa.core.config.MongoConfig;
+import earth.krakatoa.core.config.RedisConfig;
+import earth.krakatoa.core.mongo.MongoManager;
+import earth.krakatoa.core.redis.RedisManager;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.List;
@@ -20,7 +24,6 @@ import net.krakatoaapi.config.ConfigHandler;
import net.krakatoaapi.listener.PlayerJoinListener;
import net.krakatoaapi.listener.PlayerQuitListener;
import net.krakatoaapi.listener.SocketClientMessageListener;
-import net.krakatoaapi.mongo.MongoManager;
import org.bukkit.Bukkit;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.plugin.PluginManager;
@@ -33,12 +36,14 @@ public class KrakatoaAPI extends JavaPlugin {
private static KrakatoaAPI instance;
private ConfigHandler configHandler;
- private MongoManager mongoManager;
private KraSocketClientProtocol kraSocketClientProtocol;
private KraSocketClient kraSocketClient;
private KraSocketClientEventInitiater kraSocketClientEventInitiater;
private KraSocketClientEventInterface kraSocketClientEventInterface;
+ private MongoManager mongoManager;
+ private RedisManager redisManager;
+
@Override
public void onEnable() {
super.onEnable();
@@ -72,10 +77,15 @@ public class KrakatoaAPI extends JavaPlugin {
this.kraSocketClient.getSocketClient().connect();
- this.mongoManager = new MongoManager(this.configHandler.getMongodbHost(),
+ this.mongoManager = new MongoManager(new MongoConfig(this.configHandler.getMongodbHost(),
this.configHandler.getMongodbPort(), this.configHandler.getMongodbUsername(),
- this.configHandler.getMongodbPassword());
- this.mongoManager.connect(this.configHandler.getMongodbDatabase());
+ this.configHandler.getMongodbPassword(),
+ this.configHandler.getMongodbDatabase()));
+ this.mongoManager.connect();
+
+ this.redisManager = new RedisManager(
+ new RedisConfig(this.configHandler.getRedisHost(), this.getConfigHandler().getRedisPort()));
+ this.redisManager.connect();
loadListeners();
loadCommands();
@@ -97,6 +107,8 @@ public class KrakatoaAPI extends JavaPlugin {
public void onDisable() {
super.onDisable();
+ this.mongoManager.shutdown();
+
this.kraSocketClient.getSocketClient().getConnection().close();
this.kraSocketClient.getSocketClient().getConnection().closeConnection(1, "");
diff --git a/src/main/java/net/krakatoaapi/listener/PlayerJoinListener.java b/src/main/java/net/krakatoaapi/listener/PlayerJoinListener.java
index 319cb43..fb1bd2d 100644
--- a/src/main/java/net/krakatoaapi/listener/PlayerJoinListener.java
+++ b/src/main/java/net/krakatoaapi/listener/PlayerJoinListener.java
@@ -14,5 +14,9 @@ public class PlayerJoinListener implements Listener {
event.setJoinMessage(null);
// TODO: server != lobby -> send player to last location
+/*
+ RMap map = ProxySystem.getInstance().getRedisManager()
+ .getRedissonClient()
+ .getMap("player:" + uuid); */
}
}