diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java index 4e384bdd3..948db10d7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Plan.java +++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java @@ -40,7 +40,7 @@ import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; import main.java.com.djrapitops.plan.command.PlanCommand; -import main.java.com.djrapitops.plan.data.additional.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.database.databases.MySQLDB; import main.java.com.djrapitops.plan.database.databases.SQLiteDB; diff --git a/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java b/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java index 989e98f81..a678ed6a3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java +++ b/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java @@ -7,8 +7,8 @@ package main.java.com.djrapitops.plan; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.data.Action; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Action; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.tables.Actions; import main.java.com.djrapitops.plan.database.tables.SessionsTable; diff --git a/Plan/src/main/java/com/djrapitops/plan/api/API.java b/Plan/src/main/java/com/djrapitops/plan/api/API.java index 5578fb54f..d026d3929 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/API.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/API.java @@ -3,7 +3,7 @@ package main.java.com.djrapitops.plan.api; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.AnalysisData; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility; import org.bukkit.OfflinePlayer; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java index 14d9b369a..a017d5c2c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java @@ -9,7 +9,7 @@ import com.djrapitops.plugin.task.RunnableFactory; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.settings.Permissions; import main.java.com.djrapitops.plan.settings.locale.Locale; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java index 0225d0373..827ec2229 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java @@ -8,7 +8,7 @@ import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.settings.Permissions; import main.java.com.djrapitops.plan.settings.locale.Locale; import main.java.com.djrapitops.plan.settings.locale.Msg; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java index e80739f1c..354026212 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java @@ -1,14 +1,15 @@ package main.java.com.djrapitops.plan.data; import com.djrapitops.plugin.api.TimeAmount; -import com.google.common.base.Objects; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.StickyData; +import main.java.com.djrapitops.plan.data.container.TPS; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.data.time.WorldTimes; -import main.java.com.djrapitops.plan.database.tables.Actions; import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.settings.theme.Theme; +import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; @@ -568,70 +569,4 @@ public class AnalysisData extends RawData { private long value(String key) { return analyzedValues.getOrDefault(key, 0L); } -} - -class StickyData { - private final double activityIndex; - private Integer messagesSent; - private Integer onlineOnJoin; - - public StickyData(PlayerProfile player) { - activityIndex = player.getActivityIndex(player.getRegistered() + TimeAmount.DAY.ms()); - for (Action action : player.getActions()) { - if (messagesSent == null && action.getDoneAction() == Actions.FIRST_LOGOUT) { - String additionalInfo = action.getAdditionalInfo(); - String[] split = additionalInfo.split(": "); - if (split.length == 2) { - try { - messagesSent = Integer.parseInt(split[1]); - } catch (NumberFormatException ignored) { - } - } - } - if (onlineOnJoin == null && action.getDoneAction() == Actions.FIRST_SESSION) { - String additionalInfo = action.getAdditionalInfo(); - String[] split = additionalInfo.split(" "); - if (split.length == 3) { - try { - onlineOnJoin = Integer.parseInt(split[1]); - } catch (NumberFormatException ignored) { - } - } - } - } - if (messagesSent == null) { - messagesSent = 0; - } - if (onlineOnJoin == null) { - onlineOnJoin = 0; - } - } - - public double distance(StickyData data) { - double num = 0; - num += Math.abs(data.activityIndex - activityIndex) * 2.0; - num += Math.abs(data.onlineOnJoin - onlineOnJoin) / 10.0; - num += Math.abs(data.messagesSent - messagesSent) / 10.0; - - return num; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - StickyData that = (StickyData) o; - return Double.compare(that.activityIndex, activityIndex) == 0 && - Objects.equal(messagesSent, that.messagesSent) && - Objects.equal(onlineOnJoin, that.onlineOnJoin); - } - - @Override - public int hashCode() { - return Objects.hashCode(activityIndex, messagesSent, onlineOnJoin); - } - - public int getOnlineOnJoin() { - return onlineOnJoin; - } -} +} \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java b/Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java index 744dcf069..10ab5d448 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java @@ -5,6 +5,10 @@ package main.java.com.djrapitops.plan.data; import com.djrapitops.plugin.api.TimeAmount; +import main.java.com.djrapitops.plan.data.container.Action; +import main.java.com.djrapitops.plan.data.container.GeoInfo; +import main.java.com.djrapitops.plan.data.container.PlayerKill; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.utilities.MiscUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java b/Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java index dd6afbbf5..b60647123 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java @@ -8,6 +8,10 @@ import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.TimeAmount; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.PlanBungee; +import main.java.com.djrapitops.plan.data.container.GeoInfo; +import main.java.com.djrapitops.plan.data.container.PlayerKill; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.utilities.MiscUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/Action.java b/Plan/src/main/java/com/djrapitops/plan/data/container/Action.java similarity index 95% rename from Plan/src/main/java/com/djrapitops/plan/data/Action.java rename to Plan/src/main/java/com/djrapitops/plan/data/container/Action.java index d023e80ad..c4ed2b3ba 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/Action.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/Action.java @@ -2,8 +2,9 @@ * 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.data; +package main.java.com.djrapitops.plan.data.container; +import main.java.com.djrapitops.plan.data.HasDate; import main.java.com.djrapitops.plan.database.tables.Actions; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/GeoInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/data/GeoInfo.java rename to Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java index ec7192cc5..9b74c7bdb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/GeoInfo.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java @@ -2,9 +2,10 @@ * 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.data; +package main.java.com.djrapitops.plan.data.container; import com.google.common.base.Objects; +import main.java.com.djrapitops.plan.data.HasDate; /** * Data class that contains information about IP and Geolocation. diff --git a/Plan/src/main/java/com/djrapitops/plan/data/PlayerKill.java b/Plan/src/main/java/com/djrapitops/plan/data/container/PlayerKill.java similarity index 95% rename from Plan/src/main/java/com/djrapitops/plan/data/PlayerKill.java rename to Plan/src/main/java/com/djrapitops/plan/data/container/PlayerKill.java index 66b9ddf12..144d24bea 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/PlayerKill.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/PlayerKill.java @@ -1,6 +1,7 @@ -package main.java.com.djrapitops.plan.data; +package main.java.com.djrapitops.plan.data.container; import main.java.com.djrapitops.plan.Plan; +import main.java.com.djrapitops.plan.data.HasDate; import main.java.com.djrapitops.plan.database.tables.Actions; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/Session.java b/Plan/src/main/java/com/djrapitops/plan/data/container/Session.java similarity index 98% rename from Plan/src/main/java/com/djrapitops/plan/data/Session.java rename to Plan/src/main/java/com/djrapitops/plan/data/container/Session.java index 219cc274f..d65c1900f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/Session.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/Session.java @@ -1,5 +1,6 @@ -package main.java.com.djrapitops.plan.data; +package main.java.com.djrapitops.plan.data.container; +import main.java.com.djrapitops.plan.data.HasDate; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/container/StickyData.java b/Plan/src/main/java/com/djrapitops/plan/data/container/StickyData.java new file mode 100644 index 000000000..50c63cea8 --- /dev/null +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/StickyData.java @@ -0,0 +1,76 @@ +/* + * 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.data.container; + +import com.djrapitops.plugin.api.TimeAmount; +import com.google.common.base.Objects; +import main.java.com.djrapitops.plan.data.PlayerProfile; +import main.java.com.djrapitops.plan.database.tables.Actions; + +public class StickyData { + private final double activityIndex; + private Integer messagesSent; + private Integer onlineOnJoin; + + public StickyData(PlayerProfile player) { + activityIndex = player.getActivityIndex(player.getRegistered() + TimeAmount.DAY.ms()); + for (Action action : player.getActions()) { + if (messagesSent == null && action.getDoneAction() == Actions.FIRST_LOGOUT) { + String additionalInfo = action.getAdditionalInfo(); + String[] split = additionalInfo.split(": "); + if (split.length == 2) { + try { + messagesSent = Integer.parseInt(split[1]); + } catch (NumberFormatException ignored) { + } + } + } + if (onlineOnJoin == null && action.getDoneAction() == Actions.FIRST_SESSION) { + String additionalInfo = action.getAdditionalInfo(); + String[] split = additionalInfo.split(" "); + if (split.length == 3) { + try { + onlineOnJoin = Integer.parseInt(split[1]); + } catch (NumberFormatException ignored) { + } + } + } + } + if (messagesSent == null) { + messagesSent = 0; + } + if (onlineOnJoin == null) { + onlineOnJoin = 0; + } + } + + public double distance(StickyData data) { + double num = 0; + num += Math.abs(data.activityIndex - activityIndex) * 2.0; + num += Math.abs(data.onlineOnJoin - onlineOnJoin) / 10.0; + num += Math.abs(data.messagesSent - messagesSent) / 10.0; + + return num; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + StickyData that = (StickyData) o; + return Double.compare(that.activityIndex, activityIndex) == 0 && + Objects.equal(messagesSent, that.messagesSent) && + Objects.equal(onlineOnJoin, that.onlineOnJoin); + } + + @Override + public int hashCode() { + return Objects.hashCode(activityIndex, messagesSent, onlineOnJoin); + } + + public int getOnlineOnJoin() { + return onlineOnJoin; + } +} \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/data/TPS.java b/Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/data/TPS.java rename to Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java index 2dadf37e5..9b4119afa 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/TPS.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java @@ -3,8 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.data; +package main.java.com.djrapitops.plan.data.container; +import main.java.com.djrapitops.plan.data.HasDate; import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Objects; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/UserInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/container/UserInfo.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/data/UserInfo.java rename to Plan/src/main/java/com/djrapitops/plan/data/container/UserInfo.java index 9349f8171..b08220b0a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/UserInfo.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/UserInfo.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data; +package main.java.com.djrapitops.plan.data.container; import java.util.Objects; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/AnalysisContainer.java b/Plan/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/AnalysisContainer.java rename to Plan/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java index 6e5e831d4..f04d53d18 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/AnalysisContainer.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java @@ -2,7 +2,7 @@ * 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.data.additional; +package main.java.com.djrapitops.plan.data.element; import java.io.Serializable; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/InspectContainer.java b/Plan/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/InspectContainer.java rename to Plan/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java index cc730294a..6d352e7bf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/InspectContainer.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java @@ -2,7 +2,7 @@ * 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.data.additional; +package main.java.com.djrapitops.plan.data.element; import java.io.Serializable; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/TableContainer.java b/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/TableContainer.java rename to Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java index b91e14454..b825b0606 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/TableContainer.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java @@ -2,7 +2,7 @@ * 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.data.additional; +package main.java.com.djrapitops.plan.data.element; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/BanData.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/BanData.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/BanData.java rename to Plan/src/main/java/com/djrapitops/plan/data/plugin/BanData.java index 1ff281db0..15a77324c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/BanData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/BanData.java @@ -2,7 +2,7 @@ * 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.data.additional; +package main.java.com.djrapitops.plan.data.plugin; import java.util.Collection; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/ContainerSize.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java similarity index 86% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/ContainerSize.java rename to Plan/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java index a2823dbad..7482641ec 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/ContainerSize.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java @@ -2,7 +2,7 @@ * 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.data.additional; +package main.java.com.djrapitops.plan.data.plugin; /** * Enum class for PluginData to estimate the required width of the contained items. diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java rename to Plan/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java index 0b6d5c2a3..5be7ece32 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data.additional; +package main.java.com.djrapitops.plan.data.plugin; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginConfigSectionHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginConfigSectionHandler.java similarity index 96% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/PluginConfigSectionHandler.java rename to Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginConfigSectionHandler.java index 9f9b4e59f..6d118f3ba 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginConfigSectionHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginConfigSectionHandler.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data.additional; +package main.java.com.djrapitops.plan.data.plugin; import com.djrapitops.plugin.api.config.ConfigNode; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java rename to Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java index f3f8f49df..8c2fbf689 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java @@ -1,6 +1,8 @@ -package main.java.com.djrapitops.plan.data.additional; +package main.java.com.djrapitops.plan.data.plugin; import com.google.common.base.Objects; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; import main.java.com.djrapitops.plan.utilities.html.Html; import java.util.Collection; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java index 100e40ce0..bf7ee61e6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java @@ -8,7 +8,9 @@ import com.djrapitops.plugin.task.ITask; import com.djrapitops.plugin.task.RunnableFactory; import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.data.*; +import main.java.com.djrapitops.plan.data.PlayerProfile; +import main.java.com.djrapitops.plan.data.ServerProfile; +import main.java.com.djrapitops.plan.data.container.*; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.database.tables.*; import main.java.com.djrapitops.plan.database.tables.move.Version8TransferTable; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java index 8b8021a30..c8e362e82 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java @@ -7,7 +7,7 @@ package main.java.com.djrapitops.plan.database.tables; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.Action; +import main.java.com.djrapitops.plan.data.container.Action; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.processing.ExecStatement; import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java index fcedbd8f0..0f12bd929 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java @@ -2,7 +2,7 @@ package main.java.com.djrapitops.plan.database.tables; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.GeoInfo; +import main.java.com.djrapitops.plan.data.container.GeoInfo; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.processing.ExecStatement; import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java index 0785e738a..1b9343a5b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java @@ -2,8 +2,8 @@ package main.java.com.djrapitops.plan.database.tables; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.PlayerKill; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.PlayerKill; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.processing.ExecStatement; import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java index 3e313ba8c..36158a17e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java @@ -3,7 +3,7 @@ package main.java.com.djrapitops.plan.database.tables; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.processing.ExecStatement; import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java index 2084dad3b..137d605ac 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java @@ -3,7 +3,7 @@ package main.java.com.djrapitops.plan.database.tables; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.processing.ExecStatement; import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java index 77d5a89df..0889f5e7a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java @@ -8,7 +8,7 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.UserInfo; +import main.java.com.djrapitops.plan.data.container.UserInfo; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.processing.ExecStatement; import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java index ba1c2ef8c..908def93d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java @@ -2,7 +2,7 @@ package main.java.com.djrapitops.plan.database.tables; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.UserInfo; +import main.java.com.djrapitops.plan.data.container.UserInfo; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.processing.ExecStatement; import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java index fae53f910..1e5f29b79 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java @@ -3,7 +3,7 @@ package main.java.com.djrapitops.plan.database.tables; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.time.GMTimes; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.database.databases.SQLDB; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java index 273c7ecbb..fc8588aee 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/move/BatchOperationTable.java @@ -6,7 +6,7 @@ package main.java.com.djrapitops.plan.database.tables.move; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.UserInfo; +import main.java.com.djrapitops.plan.data.container.UserInfo; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.tables.ServerTable; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/cache/SessionCache.java b/Plan/src/main/java/com/djrapitops/plan/systems/cache/SessionCache.java index 7bb660cf1..9dbc789a7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/cache/SessionCache.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/cache/SessionCache.java @@ -2,7 +2,7 @@ package main.java.com.djrapitops.plan.systems.cache; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java index e97d5badc..828465668 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java @@ -10,9 +10,9 @@ import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.*; import main.java.com.djrapitops.plan.command.commands.AnalyzeCommand; import main.java.com.djrapitops.plan.data.AnalysisData; -import main.java.com.djrapitops.plan.data.additional.HookHandler; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.settings.theme.Theme; import main.java.com.djrapitops.plan.systems.cache.DataCache; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java index 833a62837..77b9641f0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java @@ -9,14 +9,14 @@ import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.api.exceptions.ParseException; -import main.java.com.djrapitops.plan.data.Action; import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Action; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.settings.theme.Theme; +import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java index 7062ae7fa..7900c404e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java @@ -7,12 +7,12 @@ package main.java.com.djrapitops.plan.systems.info.parsing; import com.djrapitops.plugin.api.TimeAmount; import main.java.com.djrapitops.plan.PlanBungee; import main.java.com.djrapitops.plan.api.exceptions.ParseException; -import main.java.com.djrapitops.plan.data.Session; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.settings.theme.Theme; +import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.systems.info.BungeeInformationManager; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanGamemodeChangeListener.java b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanGamemodeChangeListener.java index 0f050ff25..d179e36b2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanGamemodeChangeListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanGamemodeChangeListener.java @@ -1,7 +1,7 @@ package main.java.com.djrapitops.plan.systems.listeners; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.settings.WorldAliasSettings; import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.bukkit.entity.Player; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanPlayerListener.java b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanPlayerListener.java index b97b62392..6c62274a2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanPlayerListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanPlayerListener.java @@ -2,7 +2,7 @@ package main.java.com.djrapitops.plan.systems.listeners; import com.djrapitops.plugin.api.systems.NotificationCenter; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.systems.cache.DataCache; import main.java.com.djrapitops.plan.systems.processing.info.NetworkPageUpdateProcessor; import main.java.com.djrapitops.plan.systems.processing.player.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanWorldChangeListener.java b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanWorldChangeListener.java index dfa7757eb..55bcba660 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanWorldChangeListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanWorldChangeListener.java @@ -1,7 +1,7 @@ package main.java.com.djrapitops.plan.systems.listeners; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.settings.WorldAliasSettings; import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.bukkit.entity.Player; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/NewNickActionProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/NewNickActionProcessor.java index 844e8ae04..88ce0f27b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/NewNickActionProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/NewNickActionProcessor.java @@ -6,7 +6,7 @@ package main.java.com.djrapitops.plan.systems.processing; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Action; +import main.java.com.djrapitops.plan.data.container.Action; import main.java.com.djrapitops.plan.database.tables.Actions; import main.java.com.djrapitops.plan.systems.processing.player.PlayerProcessor; import main.java.com.djrapitops.plan.utilities.MiscUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/TPSInsertProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/TPSInsertProcessor.java index 10472f2d8..12d57d154 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/TPSInsertProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/TPSInsertProcessor.java @@ -5,7 +5,7 @@ package main.java.com.djrapitops.plan.systems.processing; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/ServerImportData.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/ServerImportData.java index e06b5d7c8..cc6d791ef 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/ServerImportData.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/ServerImportData.java @@ -4,7 +4,7 @@ */ package main.java.com.djrapitops.plan.systems.processing.importing; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportData.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportData.java index 2ec16a467..5c2ab0d6b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportData.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportData.java @@ -4,7 +4,7 @@ */ package main.java.com.djrapitops.plan.systems.processing.importing; -import main.java.com.djrapitops.plan.data.PlayerKill; +import main.java.com.djrapitops.plan.data.container.PlayerKill; import main.java.com.djrapitops.plan.data.time.GMTimes; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/Importer.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/Importer.java index 27203e385..b83ff81f3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/Importer.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/Importer.java @@ -9,9 +9,9 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; import com.google.common.collect.ImmutableMap; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.GeoInfo; -import main.java.com.djrapitops.plan.data.Session; -import main.java.com.djrapitops.plan.data.UserInfo; +import main.java.com.djrapitops.plan.data.container.GeoInfo; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.UserInfo; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.systems.cache.GeolocationCache; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/DeathProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/DeathProcessor.java index e192999d1..b228cc39f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/DeathProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/DeathProcessor.java @@ -1,7 +1,7 @@ package main.java.com.djrapitops.plan.systems.processing.player; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import java.util.Optional; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/FirstLeaveProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/FirstLeaveProcessor.java index 51ec9b6cb..4170b88d8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/FirstLeaveProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/FirstLeaveProcessor.java @@ -6,7 +6,7 @@ package main.java.com.djrapitops.plan.systems.processing.player; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Action; +import main.java.com.djrapitops.plan.data.container.Action; import main.java.com.djrapitops.plan.database.tables.Actions; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/IPUpdateProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/IPUpdateProcessor.java index ede984d8c..a66195c77 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/IPUpdateProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/IPUpdateProcessor.java @@ -6,7 +6,7 @@ package main.java.com.djrapitops.plan.systems.processing.player; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.GeoInfo; +import main.java.com.djrapitops.plan.data.container.GeoInfo; import main.java.com.djrapitops.plan.systems.cache.GeolocationCache; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KillProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KillProcessor.java index ee523cf35..3142db310 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KillProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KillProcessor.java @@ -1,8 +1,8 @@ package main.java.com.djrapitops.plan.systems.processing.player; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.PlayerKill; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.PlayerKill; +import main.java.com.djrapitops.plan.data.container.Session; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java index 6c833ecb7..e4450e81d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java @@ -6,7 +6,7 @@ package main.java.com.djrapitops.plan.systems.processing.player; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Action; +import main.java.com.djrapitops.plan.data.container.Action; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.database.tables.Actions; import main.java.com.djrapitops.plan.database.tables.UserInfoTable; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java index 5b200718e..ad24b8d2e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java @@ -7,7 +7,7 @@ import com.djrapitops.plugin.task.AbsRunnable; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.PlanBungee; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.systems.processing.TPSInsertProcessor; import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PlayersPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PlayersPageResponse.java index dc6224676..f26b033d8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PlayersPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PlayersPageResponse.java @@ -5,11 +5,11 @@ import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.API; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.GeoInfo; import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.Session; -import main.java.com.djrapitops.plan.data.UserInfo; -import main.java.com.djrapitops.plan.data.additional.TableContainer; +import main.java.com.djrapitops.plan.data.container.GeoInfo; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.UserInfo; +import main.java.com.djrapitops.plan.data.element.TableContainer; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.settings.theme.Theme; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java index b357b5f03..368c1ca94 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java @@ -9,8 +9,8 @@ import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.AnalysisData; import main.java.com.djrapitops.plan.data.PlayerProfile; import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.settings.locale.Locale; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java index 743e0474b..8367a0a06 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java @@ -3,7 +3,7 @@ package main.java.com.djrapitops.plan.utilities.analysis; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.time.GMTimes; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.utilities.MiscUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java index bca64636b..64a018a35 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java @@ -3,7 +3,7 @@ package main.java.com.djrapitops.plan.utilities.analysis; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.AnalysisData; -import main.java.com.djrapitops.plan.data.UserInfo; +import main.java.com.djrapitops.plan.data.container.UserInfo; import main.java.com.djrapitops.plan.settings.Settings; import java.io.File; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/ActionComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/ActionComparator.java index 028baef9b..c14febf6f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/ActionComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/ActionComparator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.Action; +import main.java.com.djrapitops.plan.data.container.Action; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/GeoInfoComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/GeoInfoComparator.java index 4a4d23ee2..4cd19547d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/GeoInfoComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/GeoInfoComparator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.GeoInfo; +import main.java.com.djrapitops.plan.data.container.GeoInfo; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/KillDataComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/KillDataComparator.java index d4f196d41..881b5892b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/KillDataComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/KillDataComparator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.PlayerKill; +import main.java.com.djrapitops.plan.data.container.PlayerKill; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PluginDataNameComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PluginDataNameComparator.java index 0d4f1a5ad..08e908d83 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PluginDataNameComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PluginDataNameComparator.java @@ -5,7 +5,7 @@ */ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionLengthComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionLengthComparator.java index 0da331c4d..d9c2fddff 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionLengthComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionLengthComparator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionStartComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionStartComparator.java index 85bd39e6a..47a878cff 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionStartComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/SessionStartComparator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/TPSComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/TPSComparator.java index 08695d18b..117590188 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/TPSComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/TPSComparator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoLastPlayedComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoLastPlayedComparator.java index f20c63f17..8d62c2234 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoLastPlayedComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoLastPlayedComparator.java @@ -5,7 +5,7 @@ */ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.UserInfo; +import main.java.com.djrapitops.plan.data.container.UserInfo; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoNameComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoNameComparator.java index f2e7d068e..c22200ec9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoNameComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/UserInfoNameComparator.java @@ -5,7 +5,7 @@ */ package main.java.com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.UserInfo; +import main.java.com.djrapitops.plan.data.container.UserInfo; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java index 89473f384..5c9c7fd93 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java @@ -8,7 +8,7 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.ServerVariableHolder; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java index a483666f5..6360d1659 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java @@ -5,7 +5,7 @@ */ package main.java.com.djrapitops.plan.utilities.html.graphs; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; import java.util.Collection; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraphCreator.java index d863b3a98..23302c47a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraphCreator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.utilities.analysis.Point; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraphCreator.java index 7e29400aa..97087a4d2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraphCreator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.utilities.analysis.Point; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraphCreator.java index 99b9dad40..ad7249f9d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraphCreator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer; import main.java.com.djrapitops.plan.utilities.analysis.Point; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraphCreator.java index 56a719c31..929f42d15 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraphCreator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.utilities.analysis.Point; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraphCreator.java index b8dbd3800..8a701014f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraphCreator.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer; import main.java.com.djrapitops.plan.utilities.analysis.Point; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/AnalysisPluginsTabContentCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/AnalysisPluginsTabContentCreator.java index 36aa2c248..8c07572c2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/AnalysisPluginsTabContentCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/AnalysisPluginsTabContentCreator.java @@ -4,9 +4,9 @@ */ package main.java.com.djrapitops.plan.utilities.html.structure; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.utilities.analysis.Analysis; import main.java.com.djrapitops.plan.utilities.comparators.PluginDataNameComparator; import main.java.com.djrapitops.plan.utilities.html.tables.PlayersTableCreator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/InspectPluginsTabContentCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/InspectPluginsTabContentCreator.java index eccff4af6..9c62aac8e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/InspectPluginsTabContentCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/InspectPluginsTabContentCreator.java @@ -5,8 +5,8 @@ package main.java.com.djrapitops.plan.utilities.html.structure; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.additional.InspectContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; +import main.java.com.djrapitops.plan.data.element.InspectContainer; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.systems.info.server.BukkitServerInfoManager; import main.java.com.djrapitops.plan.utilities.comparators.PluginDataNameComparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java index 7d4a9b97a..b9f7f6580 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java @@ -5,10 +5,10 @@ package main.java.com.djrapitops.plan.utilities.html.structure; import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.time.WorldTimes; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.settings.theme.Theme; +import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java index bb3231f8a..08a49d5ce 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java @@ -6,11 +6,11 @@ package main.java.com.djrapitops.plan.utilities.html.structure; import com.djrapitops.plugin.utilities.Verify; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.settings.theme.Theme; +import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; import main.java.com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/ActionsTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/ActionsTableCreator.java index d764e07c5..18cefe464 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/ActionsTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/ActionsTableCreator.java @@ -4,7 +4,7 @@ */ package main.java.com.djrapitops.plan.utilities.html.tables; -import main.java.com.djrapitops.plan.data.Action; +import main.java.com.djrapitops.plan.data.container.Action; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/IpTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/IpTableCreator.java index 0305d2fa2..b145a23eb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/IpTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/IpTableCreator.java @@ -4,7 +4,7 @@ */ package main.java.com.djrapitops.plan.utilities.html.tables; -import main.java.com.djrapitops.plan.data.GeoInfo; +import main.java.com.djrapitops.plan.data.container.GeoInfo; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.comparators.GeoInfoComparator; import main.java.com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTableCreator.java index 72cc57412..3d7d00cbb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTableCreator.java @@ -1,7 +1,7 @@ package main.java.com.djrapitops.plan.utilities.html.tables; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.PlayerKill; +import main.java.com.djrapitops.plan.data.container.PlayerKill; import main.java.com.djrapitops.plan.settings.locale.Locale; import main.java.com.djrapitops.plan.settings.locale.Msg; import main.java.com.djrapitops.plan.utilities.FormatUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayersTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayersTableCreator.java index c2894d20d..af96255b3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayersTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayersTableCreator.java @@ -3,9 +3,9 @@ package main.java.com.djrapitops.plan.utilities.html.tables; import com.djrapitops.plugin.api.utility.log.Log; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.additional.AnalysisContainer; -import main.java.com.djrapitops.plan.data.additional.PluginData; -import main.java.com.djrapitops.plan.data.additional.TableContainer; +import main.java.com.djrapitops.plan.data.element.AnalysisContainer; +import main.java.com.djrapitops.plan.data.element.TableContainer; +import main.java.com.djrapitops.plan.data.plugin.PluginData; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java index 66da8d86a..f2a403adf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java @@ -5,7 +5,7 @@ package main.java.com.djrapitops.plan.utilities.html.tables; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.settings.WorldAliasSettings; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/PlayerKillTest.java b/Plan/test/main/java/com/djrapitops/plan/data/PlayerKillTest.java index a2733d062..1c4a06cf9 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/PlayerKillTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/PlayerKillTest.java @@ -5,6 +5,7 @@ */ package main.java.com.djrapitops.plan.data; +import main.java.com.djrapitops.plan.data.container.PlayerKill; import org.junit.Test; import test.java.utils.RandomData; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/PlayerProfileTest.java b/Plan/test/main/java/com/djrapitops/plan/data/PlayerProfileTest.java index 60bdf66b4..d1127c33d 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/PlayerProfileTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/PlayerProfileTest.java @@ -1,6 +1,7 @@ package main.java.com.djrapitops.plan.data; import com.djrapitops.plugin.api.TimeAmount; +import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/SessionTest.java b/Plan/test/main/java/com/djrapitops/plan/data/SessionTest.java index 805961817..75bd0205e 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/SessionTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/SessionTest.java @@ -5,6 +5,7 @@ */ package main.java.com.djrapitops.plan.data; +import main.java.com.djrapitops.plan.data.container.Session; import org.junit.Before; /** diff --git a/Plan/test/main/java/com/djrapitops/plan/data/UserInfoTest.java b/Plan/test/main/java/com/djrapitops/plan/data/UserInfoTest.java index 4e7a2f808..4d60ff125 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/UserInfoTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/UserInfoTest.java @@ -1,6 +1,7 @@ package main.java.com.djrapitops.plan.data; import main.java.com.djrapitops.plan.Plan; +import main.java.com.djrapitops.plan.data.container.UserInfo; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Ignore; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/additional/importer/ImportBuilderTest.java b/Plan/test/main/java/com/djrapitops/plan/data/additional/importer/ImportBuilderTest.java index b0863a95b..8035f9af1 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/additional/importer/ImportBuilderTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/additional/importer/ImportBuilderTest.java @@ -5,8 +5,8 @@ package main.java.com.djrapitops.plan.data.additional.importer; import com.google.common.collect.ImmutableMap; -import main.java.com.djrapitops.plan.data.PlayerKill; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.PlayerKill; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.data.time.GMTimes; import main.java.com.djrapitops.plan.systems.processing.importing.ServerImportData; import main.java.com.djrapitops.plan.systems.processing.importing.UserImportData; diff --git a/Plan/test/main/java/com/djrapitops/plan/database/DatabaseTest.java b/Plan/test/main/java/com/djrapitops/plan/database/DatabaseTest.java index d895268d9..b802f86b3 100644 --- a/Plan/test/main/java/com/djrapitops/plan/database/DatabaseTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/database/DatabaseTest.java @@ -7,7 +7,8 @@ package main.java.com.djrapitops.plan.database; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.data.*; +import main.java.com.djrapitops.plan.data.WebUser; +import main.java.com.djrapitops.plan.data.container.*; import main.java.com.djrapitops.plan.data.time.GMTimes; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.database.databases.MySQLDB; diff --git a/Plan/test/main/java/com/djrapitops/plan/systems/cache/SessionCacheTest.java b/Plan/test/main/java/com/djrapitops/plan/systems/cache/SessionCacheTest.java index 8061fb6d9..104c498f2 100644 --- a/Plan/test/main/java/com/djrapitops/plan/systems/cache/SessionCacheTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/systems/cache/SessionCacheTest.java @@ -1,6 +1,6 @@ package main.java.com.djrapitops.plan.systems.cache; -import main.java.com.djrapitops.plan.data.Session; +import main.java.com.djrapitops.plan.data.container.Session; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Ignore; diff --git a/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java b/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java index bb3e134fb..91edea2df 100644 --- a/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java @@ -4,8 +4,8 @@ */ package main.java.com.djrapitops.plan.ui.graphs; -import main.java.com.djrapitops.plan.data.Session; -import main.java.com.djrapitops.plan.data.TPS; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.utilities.analysis.Point; import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraphCreator; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtilsTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtilsTest.java index aef6e4a78..7fe3b85aa 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtilsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtilsTest.java @@ -5,8 +5,6 @@ */ package main.java.com.djrapitops.plan.utilities.analysis; -import main.java.com.djrapitops.plan.data.Session; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Test; @@ -15,7 +13,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import test.java.utils.TestInit; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/comparators/ComparatorTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/comparators/ComparatorTest.java index 49d3ce420..4c7f98427 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/comparators/ComparatorTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/comparators/ComparatorTest.java @@ -1,10 +1,10 @@ package main.java.com.djrapitops.plan.utilities.comparators; import com.google.common.collect.Ordering; -import main.java.com.djrapitops.plan.data.Session; -import main.java.com.djrapitops.plan.data.TPS; -import main.java.com.djrapitops.plan.data.UserInfo; import main.java.com.djrapitops.plan.data.WebUser; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.TPS; +import main.java.com.djrapitops.plan.data.container.UserInfo; import main.java.com.djrapitops.plan.settings.locale.Message; import main.java.com.djrapitops.plan.settings.locale.Msg; import main.java.com.djrapitops.plan.utilities.PassEncryptUtil; diff --git a/Plan/test/test/java/utils/RandomData.java b/Plan/test/test/java/utils/RandomData.java index 84213c172..37292fb98 100644 --- a/Plan/test/test/java/utils/RandomData.java +++ b/Plan/test/test/java/utils/RandomData.java @@ -1,9 +1,9 @@ package test.java.utils; -import main.java.com.djrapitops.plan.data.Session; -import main.java.com.djrapitops.plan.data.TPS; -import main.java.com.djrapitops.plan.data.UserInfo; import main.java.com.djrapitops.plan.data.WebUser; +import main.java.com.djrapitops.plan.data.container.Session; +import main.java.com.djrapitops.plan.data.container.TPS; +import main.java.com.djrapitops.plan.data.container.UserInfo; import main.java.com.djrapitops.plan.utilities.PassEncryptUtil; import main.java.com.djrapitops.plan.utilities.analysis.Point; import org.apache.commons.lang3.RandomStringUtils;