From 499867b563e2edf4fd667642c9023437c8b65f28 Mon Sep 17 00:00:00 2001
From: joethei <j.theiner@live.de>
Date: Fri, 28 Oct 2016 23:51:45 +0200
Subject: [PATCH] + changed Database Information to be configurable + added
 Prefix to MessageConstants

---
 Commons.iml                                          |  2 +-
 pom.xml                                              |  3 ++-
 .../univento/commons/database/DatabaseManager.java   | 12 ++++++------
 .../commons/player/language/MessageConstant.java     |  2 ++
 .../java/eu/univento/commons/server/ServerType.java  |  3 ++-
 src/main/resources/config.properties                 | 10 +++++-----
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Commons.iml b/Commons.iml
index 1ac400d..bcd242c 100644
--- a/Commons.iml
+++ b/Commons.iml
@@ -10,7 +10,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.8" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
     <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.16" level="project" />
diff --git a/pom.xml b/pom.xml
index 2863357..337d1f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.8</version>
+            <version>1.14.8</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
diff --git a/src/main/java/eu/univento/commons/database/DatabaseManager.java b/src/main/java/eu/univento/commons/database/DatabaseManager.java
index 7740e8f..44d956c 100644
--- a/src/main/java/eu/univento/commons/database/DatabaseManager.java
+++ b/src/main/java/eu/univento/commons/database/DatabaseManager.java
@@ -23,16 +23,16 @@ public class DatabaseManager {
         //TODO: remove hardcoded variables
         mongoDB = new MongoDB(config.getString("MongoDB.Host"), config.getInteger("MongoDB.Port"), config.getString("MongoDB.Username"), config.getString("MongoDB.Password"), config.getString("MongoDB.Database"));
         asyncMongoDB = new AsyncMongoDB(config.getString("MongoDB.Host"), config.getInteger("MongoDB.Port"), config.getString("MongoDB.Username"), config.getString("MongoDB.Password"), config.getString("MongoDB.Database"));
-        mySQL = new MySQL(config.getString("MySQL.Host"), config.getString("MySQL.Port"), config.getString("MySQL.Database"), config.getString("MySQL.Username"),  config.getString("MySQL.Password"));
-        asyncMySQL = new AsyncMySQL(config.getString("MySQL.Host"), config.getString("MySQL.Port"), config.getString("MySQL.Database"), config.getString("MySQL.Username"),  config.getString("MySQL.Password"));
-        boardSQL = new AsyncMySQL(config.getString("BoardSQL.Host"), config.getString("BoardSQL.Port"), config.getString("BoardSQL.Database"), config.getString("BoardSQL.Username"), config.getString("BoardSQL.Password"));
+        //mySQL = new MySQL(config.getString("MySQL.Host"), config.getString("MySQL.Port"), config.getString("MySQL.Database"), config.getString("MySQL.Username"),  config.getString("MySQL.Password"));
+        //asyncMySQL = new AsyncMySQL(config.getString("MySQL.Host"), config.getString("MySQL.Port"), config.getString("MySQL.Database"), config.getString("MySQL.Username"),  config.getString("MySQL.Password"));
+        //boardSQL = new AsyncMySQL(config.getString("BoardSQL.Host"), config.getString("BoardSQL.Port"), config.getString("BoardSQL.Database"), config.getString("BoardSQL.Username"), config.getString("BoardSQL.Password"));
     }
 
     public void closeConnections() {
         mongoDB.closeConnection();
         asyncMongoDB.getMongoDB().closeConnection();
-        mySQL.close();
-        asyncMySQL.getMySQL().close();
-        boardSQL.getMySQL().close();
+        //mySQL.close();
+        //asyncMySQL.getMySQL().close();
+        //boardSQL.getMySQL().close();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/eu/univento/commons/player/language/MessageConstant.java b/src/main/java/eu/univento/commons/player/language/MessageConstant.java
index 18b548e..3080eae 100644
--- a/src/main/java/eu/univento/commons/player/language/MessageConstant.java
+++ b/src/main/java/eu/univento/commons/player/language/MessageConstant.java
@@ -6,6 +6,8 @@ package eu.univento.commons.player.language;
  */
 public enum MessageConstant {
 
+    PREFIX("Prefix"),
+
     SYSTEM_UNKOWN_ERROR("System.unknown_error"),
     SYSTEM_CRITICAL_ERROR("System.critical_error"),
 
diff --git a/src/main/java/eu/univento/commons/server/ServerType.java b/src/main/java/eu/univento/commons/server/ServerType.java
index 613d230..4f7a6fe 100644
--- a/src/main/java/eu/univento/commons/server/ServerType.java
+++ b/src/main/java/eu/univento/commons/server/ServerType.java
@@ -8,7 +8,8 @@ public enum ServerType {
     LOBBY(0, "Lobby", "§6Lobby"),
     SECRET_GAME_FREE4ALL(1, "Free4All", "§6Free4All"),
     SECRET_GAME_TRASHGAMES(2, "TrashGames", "§6TrashGames"),
-    GAME_WOOLGET(3, "WoolGet", "§6WoolGet");
+    GAME_WOOLGET(3, "WoolGet", "§6WoolGet"),
+    GAME_MAYA(4, "Maya", "§6Maya");
 
     private int id;
     private String name;
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
index 1ebc745..b780ab5 100644
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@@ -1,13 +1,13 @@
-MySQL.Host = univento.eu
+MySQL.Host = vps.joethei.de
 MySQL.Port = 3306
-MySQL.Username = core
-MySQL.Database = core
+MySQL.Username = univento
+MySQL.Database = univento
 MySQL.Password = dWez!530Erwz7&44
-MongoDB.Host = univento.eu
+MongoDB.Host = vps.joethei.de
 MongoDB.Port = 27017
 MongoDB.Username = admin
 MongoDB.Password = ++JT1415++
-MongoDB.Database = admin
+MongoDB.Database = univento
 BoardSQL.Host = univento.eu
 BoardSQL.Port = 3306
 BoardSQL.Username = forum