Planned DB Changes

Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java

@@ -0,0 +1,15 @@
+/* 
+ * Licence is provided in the jar as license.yml also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ */
+package main.java.com.djrapitops.plan.database.tables;
+
+/**
+ * //TODO Class Javadoc Comment
+ *
+ * @author Rsl1122
+ */
+public class ActionsTable {
+    // TODO Actions table
+    // time, action, additional info
+}

Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java

@@ -20,6 +20,7 @@ public class CommandUseTable extends Table {
 
     private final String columnCommand;
     private final String columnTimesUsed;
+    private final String columnServerID; //TODO
 
     /**
      * @param db
@@ -29,6 +30,7 @@ public class CommandUseTable extends Table {
         super("plan_commandusages", db, usingMySQL);
         columnCommand = "command";
         columnTimesUsed = "times_used";
+        columnServerID = "server_id";
     }
 
     /**

Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java

@@ -16,7 +16,9 @@ import java.util.*;
 
 /**
  * @author Rsl1122
+ * @deprecated GM Times moved to WorldTable
  */
+@Deprecated
 public class GMTimesTable extends UserIDTable {
 
     private final String columnSurvivalTime;

Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java

@@ -20,6 +20,7 @@ import java.util.*;
 public class IPsTable extends UserIDTable {
 
     private final String columnIP;
+    private final String columnGeolocation; // TODO
 
     /**
      * @param db         The database
@@ -29,6 +30,7 @@ public class IPsTable extends UserIDTable {
         super("plan_ips", db, usingMySQL);
         columnUserID = "user_id";
         columnIP = "ip";
+        columnGeolocation = "geolocation";
     }
 
     /**

Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java

@@ -22,6 +22,8 @@ public class KillsTable extends Table {
     private final String columnVictimUserID;
     private final String columnWeapon;
     private final String columnDate;
+    private final String columnServerID; //TODO
+    private final String columnSessionID; //TODO
 
     /**
      * @param db
@@ -33,6 +35,8 @@ public class KillsTable extends Table {
         columnDate = "date";
         columnKillerUserID = "killer_id";
         columnVictimUserID = "victim_id";
+        columnServerID = "server_id";
+        columnSessionID = "session_id";
     }
 
     /**

Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java

@@ -19,6 +19,7 @@ public class NicknamesTable extends UserIDTable {
 
     private final String columnNick;
     private final String columnCurrent;
+    private final String columnServerID; //TODO
 
     /**
      * @param db         The database
@@ -29,6 +30,7 @@ public class NicknamesTable extends UserIDTable {
         columnUserID = "user_id";
         columnNick = "nickname";
         columnCurrent = "current_nick";
+        columnServerID = "server_id";
     }
 
     /**

Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java

@@ -0,0 +1,16 @@
+/* 
+ * Licence is provided in the jar as license.yml also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ */
+package main.java.com.djrapitops.plan.database.tables;
+
+/**
+ * //TODO Class Javadoc Comment
+ *
+ * @author Rsl1122
+ */
+public class ServerTable {
+    //TODO Server Table
+
+    // id, uuid, webserver info, name
+}

Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java

@@ -18,8 +18,12 @@ import java.util.*;
  */
 public class SessionsTable extends UserIDTable {
 
+    private final String columnSessionID; //TODO
     private final String columnSessionStart;
     private final String columnSessionEnd;
+    private final String columnServerID; //TODO
+    private final String columnMobKills; //TODO
+    private final String columnDeaths; //TODO
 
     /**
      * @param db
@@ -30,6 +34,10 @@ public class SessionsTable extends UserIDTable {
         columnUserID = "user_id";
         columnSessionStart = "session_start";
         columnSessionEnd = "session_end";
+        columnServerID = "server_id";
+        columnSessionID = "id";
+        columnMobKills = "mob_kills";
+        columnDeaths = "deaths";
     }
 
     /**

Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java

@@ -24,6 +24,7 @@ import java.util.List;
  */
 public class TPSTable extends Table {
 
+    private final String columnServerID; //TODO
     private final String columnDate;
     private final String columnTPS;
     private final String columnPlayers;
@@ -38,6 +39,7 @@ public class TPSTable extends Table {
      */
     public TPSTable(SQLDB db, boolean usingMySQL) {
         super("plan_tps", db, usingMySQL);
+        columnServerID = "server_id";
         columnDate = "date";
         columnTPS = "tps";
         columnPlayers = "players_online";

Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java

@@ -27,42 +27,23 @@ public class UsersTable extends Table {
 
     private final String columnID;
     private final String columnUUID;
-    private final String columnGeolocation;
+    @Deprecated private final String columnGeolocation;
-    private final String columnLastGM;
+    @Deprecated private final String columnLastGM;
-    private final String columnLastGMSwapTime;
+    @Deprecated private final String columnLastGMSwapTime;
-    private final String columnPlayTime;
+    @Deprecated private final String columnPlayTime;
-    private final String columnLoginTimes;
+    @Deprecated private final String columnLoginTimes;
-    private final String columnLastPlayed;
+    @Deprecated private final String columnLastPlayed;
-    private final String columnDeaths;
+    @Deprecated private final String columnDeaths;
-    private final String columnMobKills;
+    @Deprecated private final String columnMobKills;
-    /**
-     * @since 3.3.0
-     */
     private final String columnRegistered;
-    /**
+    //TODO Server Specific Table (Also has registered on it)
-     * @since 3.3.0
+    @Deprecated private final String columnOP;
-     */
+    @Deprecated private final String columnName;
-    private final String columnOP;
+    @Deprecated private final String columnBanned;
-    /**
+    //
-     * @since 3.3.0
+    @Deprecated private final String columnContainsBukkitData;
-     */
+    @Deprecated private final String columnLastWorldSwapTime;
-    private final String columnName;
+    @Deprecated private final String columnLastWorld;
-    /**
-     * @since 3.3.0
-     */
-    private final String columnBanned;
-    /**
-     * @since 3.3.0
-     */
-    private final String columnContainsBukkitData;
-    /**
-     * @since 3.6.0
-     */
-    private final String columnLastWorldSwapTime;
-    /**
-     * @since 3.6.0
-     */
-    private final String columnLastWorld;
 
     /**
      * @param db

Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java

@@ -25,6 +25,7 @@ public class WorldTable extends Table {
 
     private final String columnWorldId;
     private final String columnWorldName;
+    private final String columnServerID; //TODO
 
     /**
      * Constructor.
@@ -36,6 +37,7 @@ public class WorldTable extends Table {
         super("plan_worlds", db, usingMySQL);
         columnWorldId = "world_id";
         columnWorldName = "world_name";
+        columnServerID = "server_id";
     }
 
     @Override

Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java

@@ -21,12 +21,14 @@ import java.util.Map;
  */
 public class WorldTimesTable extends UserIDTable {
 
+    private final String columnServerID; //TODO
     private final WorldTable worldTable;
     private final String worldIDColumn;
     private final String worldNameColumn;
 
     private final String columnWorldId;
-    private final String columnPlaytime;
+    @Deprecated private final String columnPlaytime;
+    //TODO GM Times to World table
 
     private final String selectWorldIDsql;
 
@@ -44,6 +46,7 @@ public class WorldTimesTable extends UserIDTable {
         columnWorldId = "world_id";
         columnUserID = "user_id";
         columnPlaytime = "playtime";
+        columnServerID = "server_id";
 
         selectWorldIDsql = "(SELECT " + worldIDColumn + " FROM " + worldTable + " WHERE (" + worldNameColumn + "=?))";
     }