diff --git a/Plan/dependency-reduced-pom.xml b/Plan/dependency-reduced-pom.xml index 57988a80c4..ffad708140 100644 --- a/Plan/dependency-reduced-pom.xml +++ b/Plan/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.djrapitops Plan - 4.0.0 + 4.2.0-SNAPSHOT ${basedir}/src ${basedir}/test @@ -13,29 +13,17 @@ . ${basedir}/src/main/resources - *.keystore - *.css - *.yml - *.html + **/*.keystore + **/*.css + **/*.yml + **/*.html + **/*.js + **/*.css licence.yml - - . - ${basedir}/src/main/resources/html - - *.html - - - - . - ${basedir}/src/main/resources/js - - *.js - - ${project.name} @@ -116,42 +104,152 @@ bungeecord-repo https://oss.sonatype.org/content/repositories/snapshots + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + paper-repo + https://repo.destroystokyo.com/repository/maven-public/ + com.destroystokyo.paper - paper - 1.12-R0.1-20170725.202533-1 + paper-api + 1.12.2-R0.1-SNAPSHOT provided + + + authlib + com.mojang + + + commons-lang + commons-lang + + + json-simple + com.googlecode.json-simple + + + jsr305 + com.google.code.findbugs + + + guava + com.google.guava + + + gson + com.google.code.gson + + + snakeyaml + org.yaml + + + bungeecord-chat + net.md-5 + + + slf4j-api + org.slf4j + + + asm-all + org.ow2.asm + + - net.md-5 - bungeecord-api - 1.12-SNAPSHOT + org.spigotmc + spigot-api + 1.12-R0.1-SNAPSHOT provided - bungeecord-chat - net.md-5 - - - bungeecord-config - net.md-5 - - - bungeecord-event - net.md-5 - - - bungeecord-protocol - net.md-5 - - - guava - com.google.guava + commons-lang + commons-lang + + json-simple + com.googlecode.json-simple + + + guava + com.google.guava + + + gson + com.google.code.gson + + + snakeyaml + org.yaml + + + bungeecord-chat + net.md-5 + + + org.bukkit + bukkit + 1.12.2-R0.1-SNAPSHOT + provided + + + commons-lang + commons-lang + + + json-simple + com.googlecode.json-simple + + + guava + com.google.guava + + + gson + com.google.code.gson + + + snakeyaml + org.yaml + + + + + net.md-5 + bungeecord-api + 1.12-SNAPSHOT + provided + + + bungeecord-config + net.md-5 + + + bungeecord-event + net.md-5 + + + bungeecord-protocol + net.md-5 + + + bungeecord-chat + net.md-5 + + + guava + com.google.guava + + + org.powermock powermock diff --git a/Plan/pom.xml b/Plan/pom.xml index 1091417d50..d75ce1638d 100644 --- a/Plan/pom.xml +++ b/Plan/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.djrapitops Plan - 4.1.3.2 + 4.2.0-SNAPSHOT jar @@ -32,17 +32,17 @@ com.djrapitops PlanPluginBridge - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT compile - + com.destroystokyo.paper paper-api 1.12.2-R0.1-SNAPSHOT provided - + org.spigotmc spigot-api @@ -157,8 +157,8 @@ clean package install ${project.name} - ${basedir}/src - ${basedir}/test + ${basedir}/src/main/java + ${basedir}/test/main/java . @@ -216,6 +216,11 @@ + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + org.apache.maven.plugins maven-jar-plugin diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java index ea67617d79..108f80c4f0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Plan.java +++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java @@ -17,8 +17,40 @@ * Or here * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/licence.yml */ -package main.java.com.djrapitops.plan; - +package com.djrapitops.plan; + +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.command.PlanCommand; +import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.settings.theme.PlanColorScheme; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.systems.Systems; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.cache.GeolocationCache; +import com.djrapitops.plan.systems.file.FileSystem; +import com.djrapitops.plan.systems.file.config.ConfigSystem; +import com.djrapitops.plan.systems.file.database.DBSystem; +import com.djrapitops.plan.systems.info.BukkitInformationManager; +import com.djrapitops.plan.systems.info.ImporterManager; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.info.server.BukkitServerInfoManager; +import com.djrapitops.plan.systems.listeners.*; +import com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.systems.processing.importing.importers.OfflinePlayerImporter; +import com.djrapitops.plan.systems.queue.ProcessingQueue; +import com.djrapitops.plan.systems.tasks.TaskSystem; +import com.djrapitops.plan.systems.update.VersionCheckSystem; +import com.djrapitops.plan.systems.webserver.WebServer; +import com.djrapitops.plan.systems.webserver.WebServerSystem; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.utilities.file.export.HtmlExport; +import com.djrapitops.plan.utilities.metrics.BStats; import com.djrapitops.plugin.BukkitPlugin; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.Benchmark; @@ -30,38 +62,6 @@ import com.djrapitops.plugin.settings.ColorScheme; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.command.PlanCommand; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; -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; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.settings.theme.PlanColorScheme; -import main.java.com.djrapitops.plan.settings.theme.Theme; -import main.java.com.djrapitops.plan.systems.Systems; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.cache.GeolocationCache; -import main.java.com.djrapitops.plan.systems.file.FileSystem; -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; -import main.java.com.djrapitops.plan.systems.file.database.DBSystem; -import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; -import main.java.com.djrapitops.plan.systems.info.ImporterManager; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.info.server.BukkitServerInfoManager; -import main.java.com.djrapitops.plan.systems.listeners.*; -import main.java.com.djrapitops.plan.systems.processing.Processor; -import main.java.com.djrapitops.plan.systems.processing.importing.importers.OfflinePlayerImporter; -import main.java.com.djrapitops.plan.systems.queue.ProcessingQueue; -import main.java.com.djrapitops.plan.systems.tasks.TaskSystem; -import main.java.com.djrapitops.plan.systems.update.VersionCheckSystem; -import main.java.com.djrapitops.plan.systems.webserver.WebServer; -import main.java.com.djrapitops.plan.systems.webserver.WebServerSystem; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.utilities.file.export.HtmlExport; -import main.java.com.djrapitops.plan.utilities.metrics.BStats; import org.bukkit.configuration.file.FileConfiguration; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java index a71d1c561f..af170eb8b8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java @@ -2,8 +2,31 @@ * 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; - +package com.djrapitops.plan; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.command.PlanBungeeCommand; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.settings.theme.PlanColorScheme; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.systems.Systems; +import com.djrapitops.plan.systems.file.FileSystem; +import com.djrapitops.plan.systems.file.config.ConfigSystem; +import com.djrapitops.plan.systems.file.database.DBSystem; +import com.djrapitops.plan.systems.info.BungeeInformationManager; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; +import com.djrapitops.plan.systems.listeners.BungeePlayerListener; +import com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.systems.queue.ProcessingQueue; +import com.djrapitops.plan.systems.tasks.TaskSystem; +import com.djrapitops.plan.systems.update.VersionCheckSystem; +import com.djrapitops.plan.systems.webserver.WebServer; +import com.djrapitops.plan.systems.webserver.WebServerSystem; +import com.djrapitops.plan.utilities.file.export.HtmlExport; import com.djrapitops.plugin.BungeePlugin; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.Benchmark; @@ -13,29 +36,6 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.settings.ColorScheme; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.command.PlanBungeeCommand; -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; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.settings.theme.PlanColorScheme; -import main.java.com.djrapitops.plan.settings.theme.Theme; -import main.java.com.djrapitops.plan.systems.Systems; -import main.java.com.djrapitops.plan.systems.file.FileSystem; -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; -import main.java.com.djrapitops.plan.systems.file.database.DBSystem; -import main.java.com.djrapitops.plan.systems.info.BungeeInformationManager; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; -import main.java.com.djrapitops.plan.systems.listeners.BungeePlayerListener; -import main.java.com.djrapitops.plan.systems.processing.Processor; -import main.java.com.djrapitops.plan.systems.queue.ProcessingQueue; -import main.java.com.djrapitops.plan.systems.tasks.TaskSystem; -import main.java.com.djrapitops.plan.systems.update.VersionCheckSystem; -import main.java.com.djrapitops.plan.systems.webserver.WebServer; -import main.java.com.djrapitops.plan.systems.webserver.WebServerSystem; -import main.java.com.djrapitops.plan.utilities.file.export.HtmlExport; import java.io.InputStream; import java.util.UUID; @@ -51,7 +51,7 @@ public class PlanBungee extends BungeePlugin implements IPlan { private BungeeServerInfoManager serverInfoManager; private BungeeInformationManager infoManager; - private ServerVariableHolder variableHolder; + private com.djrapitops.plan.ServerVariableHolder variableHolder; private ProcessingQueue processingQueue; @@ -69,7 +69,7 @@ public void onEnable() { VersionCheckSystem.getInstance().init(); - variableHolder = new ServerVariableHolder(getProxy()); + variableHolder = new com.djrapitops.plan.ServerVariableHolder(getProxy()); new Locale().loadLocale(); @@ -188,7 +188,7 @@ public ColorScheme getColorScheme() { } @Override - public ServerVariableHolder getVariable() { + public com.djrapitops.plan.ServerVariableHolder getVariable() { return variableHolder; } diff --git a/Plan/src/main/java/com/djrapitops/plan/ServerVariableHolder.java b/Plan/src/main/java/com/djrapitops/plan/ServerVariableHolder.java index da7f240d44..3b3ed362ab 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ServerVariableHolder.java +++ b/Plan/src/main/java/com/djrapitops/plan/ServerVariableHolder.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan; +package com.djrapitops.plan; -import main.java.com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.Settings; import net.md_5.bungee.api.ProxyServer; import org.bukkit.Server; diff --git a/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java b/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java index a678ed6a36..f8757d6b12 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java +++ b/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java @@ -2,19 +2,19 @@ * 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; +package com.djrapitops.plan; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.tables.Actions; +import com.djrapitops.plan.database.tables.SessionsTable; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.cache.SessionCache; +import com.djrapitops.plan.utilities.MiscUtils; 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.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; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.cache.SessionCache; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.SQLException; import java.util.Map; 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 6b36d32116..306f29e0a5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/API.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/API.java @@ -1,12 +1,12 @@ -package main.java.com.djrapitops.plan.api; - +package com.djrapitops.plan.api; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.data.AnalysisData; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.systems.info.BukkitInformationManager; +import com.djrapitops.plan.utilities.uuid.UUIDUtility; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.ParseException; -import main.java.com.djrapitops.plan.data.AnalysisData; -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; import java.sql.SQLException; @@ -220,7 +220,7 @@ public String getPlayerName(UUID uuid) throws SQLException { * @deprecated Typo in method name, use playerNameToUUID instead */ @Deprecated - public UUID PlayerNameToUUID(String playerName) throws Exception { + public UUID PlayerNameToUUID(String playerName) { return playerNameToUUID(playerName); } diff --git a/Plan/src/main/java/com/djrapitops/plan/api/IPlan.java b/Plan/src/main/java/com/djrapitops/plan/api/IPlan.java index 7c686aad52..53c27e9b05 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/IPlan.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/IPlan.java @@ -2,18 +2,18 @@ * 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.api; - +package com.djrapitops.plan.api; + +import com.djrapitops.plan.ServerVariableHolder; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.systems.Systems; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.systems.queue.ProcessingQueue; +import com.djrapitops.plan.systems.webserver.WebServer; import com.djrapitops.plugin.IPlugin; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.settings.ColorScheme; -import main.java.com.djrapitops.plan.ServerVariableHolder; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.systems.Systems; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.processing.Processor; -import main.java.com.djrapitops.plan.systems.queue.ProcessingQueue; -import main.java.com.djrapitops.plan.systems.webserver.WebServer; import java.io.File; import java.io.InputStream; diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DBCreateTableException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DBCreateTableException.java index 28f6686a7c..a107022f8a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DBCreateTableException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DBCreateTableException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when something goes wrong with creating tables with {@code Table#createTable}. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseException.java index 98e28b753b..5804614aaf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when something goes wrong with the Database, generic exception. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseInitException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseInitException.java index e63ba8fc7b..73628a3b08 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseInitException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseInitException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when something goes wrong with {@code Database#init}. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.java index 4d854f4573..c72bdd4b6f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Exception thrown when PageParser encounters an Exception. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/PlanEnableException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/PlanEnableException.java index 3376a5bb75..46888e8ffb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/PlanEnableException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/PlanEnableException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when something goes wrong with Plan initialization. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIConnectionFailException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIConnectionFailException.java index 02a8bada49..9acef62414 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIConnectionFailException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIConnectionFailException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when WebAPI fails to connect to an address. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIException.java index e5ab24a0e2..6cbf73b4ab 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when WebAPI POST-request fails, general Exception. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIFailException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIFailException.java index 038bc19881..354db876bb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIFailException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIFailException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Group of WebAPIExceptions that can be considered a failed connection state on some occasions. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIForbiddenException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIForbiddenException.java index aad5ad43e1..8aa2a587e6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIForbiddenException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIForbiddenException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when WebAPI gets a 403 response. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIInternalErrorException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIInternalErrorException.java index 25d9d80fcd..1c44dc6c95 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIInternalErrorException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPIInternalErrorException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when WebAPI returns 404, usually when response is supposed to be false. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPINotFoundException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPINotFoundException.java index 68a2587f13..e2eb5c632e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPINotFoundException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebAPINotFoundException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when WebAPI returns 404, usually when response is supposed to be false. diff --git a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebUserAuthException.java b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebUserAuthException.java index 6ce13c53a3..892bc46811 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebUserAuthException.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebUserAuthException.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.api.exceptions; +package com.djrapitops.plan.api.exceptions; /** * Thrown when WebUser can not be authorized (WebServer). diff --git a/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java b/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java index c94447f672..d5bd2dcaba 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/ConditionUtils.java @@ -1,9 +1,9 @@ -package main.java.com.djrapitops.plan.command; +package com.djrapitops.plan.command; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.PlanBungee; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java index 32426b3c10..b2907fd3a6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.command; +package com.djrapitops.plan.command; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.command.commands.*; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.TreeCommand; import com.djrapitops.plugin.command.defaultcmds.StatusCommand; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.command.commands.*; -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; /** * TreeCommand for the /plan command, and all subcommands. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java index a9f6d6a551..1247c9ca75 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java @@ -1,14 +1,14 @@ -package main.java.com.djrapitops.plan.command; +package com.djrapitops.plan.command; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.command.commands.*; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.TreeCommand; import com.djrapitops.plugin.command.defaultcmds.StatusCommand; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.command.commands.*; -import main.java.com.djrapitops.plan.settings.Permissions; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; /** * TreeCommand for the /plan command, and all subcommands. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java index 63f9c6c08e..493ddd68e9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java @@ -1,5 +1,11 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.info.server.ServerInfo; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.CommandUtils; @@ -8,12 +14,6 @@ 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.settings.Permissions; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; import org.bukkit.ChatColor; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/BungeeSetupToggleCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/BungeeSetupToggleCommand.java index 9998224cc5..25db2b3be8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/BungeeSetupToggleCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/BungeeSetupToggleCommand.java @@ -2,13 +2,13 @@ * 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.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.settings.Permissions; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.settings.Permissions; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java index fdde4bcfc4..a56ae6a5bb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java @@ -2,18 +2,18 @@ * 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.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI; +import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI; -import main.java.com.djrapitops.plan.utilities.Condition; import java.util.Optional; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java index a9ac3805f9..a5221fa006 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/InfoCommand.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.settings.ColorScheme; -import main.java.com.djrapitops.plan.Plan; -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; /** * This subcommand is used to view the version and the database type in use. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java index aca0093314..24efbe4e75 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java @@ -1,5 +1,14 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.command.ConditionUtils; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.processing.info.InspectCacheRequestProcessor; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.uuid.UUIDUtility; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.CommandUtils; @@ -8,15 +17,6 @@ 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.command.ConditionUtils; -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; -import main.java.com.djrapitops.plan.systems.processing.info.InspectCacheRequestProcessor; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility; import org.bukkit.ChatColor; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java index 144f3aa9b6..f385c96c70 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.CommandUtils; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; -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; -import main.java.com.djrapitops.plan.utilities.MiscUtils; /** * Command used to display link to the player list webpage. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ListServersCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ListServersCommand.java index 7e22450f35..6efc95d4ee 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ListServersCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ListServersCommand.java @@ -1,14 +1,14 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.settings.ColorScheme; -import main.java.com.djrapitops.plan.api.IPlan; -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; import java.sql.SQLException; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java index bd64bdc2ce..28fe8f3f7c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java @@ -1,12 +1,12 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.command.commands.manage.*; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.TreeCommand; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.command.commands.manage.*; -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; /** * This command is used to manage the database of the plugin. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/NetworkCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/NetworkCommand.java index a530742885..1b473e9d33 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/NetworkCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/NetworkCommand.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.CommandUtils; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; -import main.java.com.djrapitops.plan.api.IPlan; -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; /** * Command used to display link to the player list webpage. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/QInspectCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/QInspectCommand.java index 3cb1bc638e..0af0d93481 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/QInspectCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/QInspectCommand.java @@ -1,5 +1,14 @@ -package main.java.com.djrapitops.plan.command.commands; - +package com.djrapitops.plan.command.commands; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.uuid.UUIDUtility; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; @@ -9,15 +18,6 @@ import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.PlayerProfile; -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; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility; import java.sql.SQLException; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java index c4731408d5..97e17055a3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java @@ -1,5 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.database.tables.SecurityTable; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.PassEncryptUtil; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; @@ -8,14 +16,6 @@ import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.WebUser; -import main.java.com.djrapitops.plan.database.tables.SecurityTable; -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; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.PassEncryptUtil; /** * Command for registering web users. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java index 2e8e1e2861..03cb6442cf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; import com.google.common.collect.ImmutableSet; import org.apache.logging.log4j.Level; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ReloadCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ReloadCommand.java index 7e201b5fdc..0ed5dc405a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ReloadCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ReloadCommand.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; -import main.java.com.djrapitops.plan.api.IPlan; -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; /** * This subcommand is used to reload the plugin. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java index 05af4c83b7..15bdf37606 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java @@ -1,5 +1,11 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; @@ -7,12 +13,6 @@ import com.djrapitops.plugin.task.RunnableFactory; import com.djrapitops.plugin.utilities.FormatUtils; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.Plan; -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; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.util.Arrays; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java index aa409c6178..72540429ac 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java @@ -1,17 +1,17 @@ -package main.java.com.djrapitops.plan.command.commands; +package com.djrapitops.plan.command.commands; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.command.commands.webuser.WebCheckCommand; +import com.djrapitops.plan.command.commands.webuser.WebDeleteCommand; +import com.djrapitops.plan.command.commands.webuser.WebLevelCommand; +import com.djrapitops.plan.command.commands.webuser.WebListUsersCommand; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.TreeCommand; -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.command.commands.webuser.WebCheckCommand; -import main.java.com.djrapitops.plan.command.commands.webuser.WebDeleteCommand; -import main.java.com.djrapitops.plan.command.commands.webuser.WebLevelCommand; -import main.java.com.djrapitops.plan.command.commands.webuser.WebListUsersCommand; -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; /** * Web subcommand used to manage Web users. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java index 9079a1ce89..5c05d1ef79 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java @@ -1,5 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands.manage; +package com.djrapitops.plan.command.commands.manage; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.ManageUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; @@ -7,14 +15,6 @@ 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.api.exceptions.DatabaseInitException; -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; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.ManageUtils; /** * This manage subcommand is used to backup a database to a .db file. 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 856e923a39..3df462979b 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 @@ -1,5 +1,17 @@ -package main.java.com.djrapitops.plan.command.commands.manage; - +package com.djrapitops.plan.command.commands.manage; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.cache.SessionCache; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.ManageUtils; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; @@ -7,18 +19,6 @@ 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.api.exceptions.DatabaseInitException; -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; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.cache.SessionCache; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.ManageUtils; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java index 2052d1fabd..b73515bb00 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands.manage; +package com.djrapitops.plan.command.commands.manage; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.listeners.PlanPlayerListener; +import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; -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; -import main.java.com.djrapitops.plan.systems.listeners.PlanPlayerListener; -import main.java.com.djrapitops.plan.utilities.Condition; /** * This manage SubCommand is used to disable some features of the plugin temporarily. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java index 21f95bb965..6c8263f40d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java @@ -1,19 +1,19 @@ -package main.java.com.djrapitops.plan.command.commands.manage; - +package com.djrapitops.plan.command.commands.manage; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.ManageUtils; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.settings.Permissions; -import main.java.com.djrapitops.plan.settings.Settings; -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.Condition; -import main.java.com.djrapitops.plan.utilities.ManageUtils; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java index 2495b23b67..68fee6e8b2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java @@ -1,16 +1,16 @@ -package main.java.com.djrapitops.plan.command.commands.manage; +package com.djrapitops.plan.command.commands.manage; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.info.ImporterManager; +import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.Plan; -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; -import main.java.com.djrapitops.plan.systems.info.ImporterManager; -import main.java.com.djrapitops.plan.utilities.Condition; /** * This manage subcommand is used to import data from 3rd party plugins. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java index f4edde6932..c096670074 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageMoveCommand.java @@ -1,5 +1,12 @@ -package main.java.com.djrapitops.plan.command.commands.manage; - +package com.djrapitops.plan.command.commands.manage; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.ManageUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; @@ -7,13 +14,6 @@ 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.database.Database; -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; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.ManageUtils; /** * This manage subcommand is used to move all data from one database to another. 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 827ec2229c..4823bd0a39 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 @@ -1,5 +1,15 @@ -package main.java.com.djrapitops.plan.command.commands.manage; - +package com.djrapitops.plan.command.commands.manage; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.cache.SessionCache; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.uuid.UUIDUtility; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; @@ -7,16 +17,6 @@ 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.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; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.cache.SessionCache; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility; import org.bukkit.entity.Player; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java index 90f39a6c0b..b5857ade38 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java @@ -1,5 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands.manage; - +package com.djrapitops.plan.command.commands.manage; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.databases.SQLiteDB; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; +import com.djrapitops.plan.utilities.ManageUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; @@ -7,14 +15,6 @@ 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.database.Database; -import main.java.com.djrapitops.plan.database.databases.SQLiteDB; -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; -import main.java.com.djrapitops.plan.utilities.Condition; -import main.java.com.djrapitops.plan.utilities.ManageUtils; import java.io.File; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java index 733efb081a..73931ea71d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java @@ -1,19 +1,19 @@ -package main.java.com.djrapitops.plan.command.commands.manage; +package com.djrapitops.plan.command.commands.manage; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.api.exceptions.WebAPIForbiddenException; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.webserver.webapi.bungee.RequestSetupWebAPI; +import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIForbiddenException; -import main.java.com.djrapitops.plan.settings.Permissions; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bungee.RequestSetupWebAPI; -import main.java.com.djrapitops.plan.utilities.Condition; /** * This manage subcommand is used to swap to a different database and reload the diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebCheckCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebCheckCommand.java index 783553a441..c5864cb865 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebCheckCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebCheckCommand.java @@ -1,18 +1,18 @@ -package main.java.com.djrapitops.plan.command.commands.webuser; +package com.djrapitops.plan.command.commands.webuser; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.database.tables.SecurityTable; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.WebUser; -import main.java.com.djrapitops.plan.database.tables.SecurityTable; -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; -import main.java.com.djrapitops.plan.utilities.Condition; import org.bukkit.ChatColor; /** diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java index 1bc6c6a2a3..2262b267d4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java @@ -1,17 +1,17 @@ -package main.java.com.djrapitops.plan.command.commands.webuser; +package com.djrapitops.plan.command.commands.webuser; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.database.tables.SecurityTable; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.database.tables.SecurityTable; -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; -import main.java.com.djrapitops.plan.utilities.Condition; import net.md_5.bungee.api.ChatColor; /** diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebLevelCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebLevelCommand.java index 80390d7282..879b66476f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebLevelCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebLevelCommand.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.command.commands.webuser; +package com.djrapitops.plan.command.commands.webuser; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.SubCommand; import com.djrapitops.plugin.settings.ColorScheme; -import main.java.com.djrapitops.plan.api.IPlan; -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; /** * Subcommand for info about permission levels. diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java index 43de6a3a06..689b61fe74 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java @@ -1,5 +1,11 @@ -package main.java.com.djrapitops.plan.command.commands.webuser; +package com.djrapitops.plan.command.commands.webuser; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.comparators.WebUserComparator; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; @@ -7,12 +13,6 @@ import com.djrapitops.plugin.settings.ColorScheme; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.WebUser; -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; -import main.java.com.djrapitops.plan.utilities.comparators.WebUserComparator; import java.util.List; 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 118acfbba8..3aee89fa30 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java @@ -1,33 +1,33 @@ -package main.java.com.djrapitops.plan.data; - +package com.djrapitops.plan.data; + +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.StickyData; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.HealthNotes; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.utilities.comparators.SessionStartComparator; +import com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.HtmlUtils; +import com.djrapitops.plan.utilities.html.graphs.ActivityStackGraph; +import com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; +import com.djrapitops.plan.utilities.html.graphs.WorldMap; +import com.djrapitops.plan.utilities.html.graphs.line.*; +import com.djrapitops.plan.utilities.html.graphs.pie.ActivityPie; +import com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; +import com.djrapitops.plan.utilities.html.structure.AnalysisPluginsTabContentCreator; +import com.djrapitops.plan.utilities.html.structure.SessionTabStructureCreator; +import com.djrapitops.plan.utilities.html.tables.CommandUseTableCreator; +import com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; import com.djrapitops.plugin.api.TimeAmount; -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.element.HealthNotes; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -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.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; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; -import main.java.com.djrapitops.plan.utilities.comparators.SessionStartComparator; -import main.java.com.djrapitops.plan.utilities.html.Html; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.ActivityStackGraph; -import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; -import main.java.com.djrapitops.plan.utilities.html.graphs.WorldMap; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.*; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.ActivityPie; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; -import main.java.com.djrapitops.plan.utilities.html.structure.AnalysisPluginsTabContentCreator; -import main.java.com.djrapitops.plan.utilities.html.structure.SessionTabStructureCreator; -import main.java.com.djrapitops.plan.utilities.html.tables.CommandUseTableCreator; -import main.java.com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; import java.util.*; import java.util.stream.Collectors; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/HasDate.java b/Plan/src/main/java/com/djrapitops/plan/data/HasDate.java index 73751d8809..5c4b03c63c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/HasDate.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/HasDate.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; +package com.djrapitops.plan.data; /** * //TODO Class Javadoc Comment 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 9361c6160c..fd75a57735 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java @@ -2,18 +2,18 @@ * 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 com.djrapitops.plan.data; + +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.comparators.ActionComparator; +import com.djrapitops.plan.utilities.comparators.GeoInfoComparator; 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; -import main.java.com.djrapitops.plan.utilities.comparators.ActionComparator; -import main.java.com.djrapitops.plan.utilities.comparators.GeoInfoComparator; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.OfflinePlayer; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/RawData.java b/Plan/src/main/java/com/djrapitops/plan/data/RawData.java index 3046885b75..5f2f7cd69e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/RawData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/RawData.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data; +package com.djrapitops.plan.data; import com.djrapitops.plugin.utilities.Verify; 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 abcec2ce97..09fde39390 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java @@ -2,24 +2,24 @@ * 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 com.djrapitops.plan.data; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.utilities.comparators.PlayerProfileLastPlayedComparator; +import com.djrapitops.plan.utilities.comparators.TPSComparator; +import com.djrapitops.plan.utilities.html.tables.PlayersTableCreator; 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; -import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; -import main.java.com.djrapitops.plan.utilities.comparators.PlayerProfileLastPlayedComparator; -import main.java.com.djrapitops.plan.utilities.comparators.TPSComparator; -import main.java.com.djrapitops.plan.utilities.html.tables.PlayersTableCreator; import java.util.*; import java.util.function.Function; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/WebUser.java b/Plan/src/main/java/com/djrapitops/plan/data/WebUser.java index eea832f2a2..f773b393c4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/WebUser.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/WebUser.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data; +package com.djrapitops.plan.data; import java.util.Objects; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/container/Action.java b/Plan/src/main/java/com/djrapitops/plan/data/container/Action.java index c4ed2b3bab..b7c067b507 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/container/Action.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/Action.java @@ -2,12 +2,12 @@ * 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; +package 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; +import com.djrapitops.plan.data.HasDate; +import com.djrapitops.plan.database.tables.Actions; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.Html; import java.util.Objects; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java index 9b74c7bdbf..c9fa363c56 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java @@ -2,10 +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.container; +package com.djrapitops.plan.data.container; +import com.djrapitops.plan.data.HasDate; 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/container/PlayerKill.java b/Plan/src/main/java/com/djrapitops/plan/data/container/PlayerKill.java index 144d24bea1..18f4aead36 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/container/PlayerKill.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/PlayerKill.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.data.container; +package 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 com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.HasDate; +import com.djrapitops.plan.database.tables.Actions; import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Objects; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/container/Session.java b/Plan/src/main/java/com/djrapitops/plan/data/container/Session.java index d65c1900f3..7a802d477e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/container/Session.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/Session.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.data.container; +package 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 com.djrapitops.plan.data.HasDate; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.utilities.MiscUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.ArrayList; 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 index 50c63cea89..d5cdaa9287 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/container/StickyData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/StickyData.java @@ -2,12 +2,12 @@ * 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; +package com.djrapitops.plan.data.container; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.database.tables.Actions; 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; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java b/Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java index 9b4119afa1..753e94712a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/container/TPS.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.data.container; +package com.djrapitops.plan.data.container; -import main.java.com.djrapitops.plan.data.HasDate; +import 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/container/UserInfo.java b/Plan/src/main/java/com/djrapitops/plan/data/container/UserInfo.java index b08220b0ab..6c99b9c742 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/container/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.container; +package com.djrapitops.plan.data.container; import java.util.Objects; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java b/Plan/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java index f04d53d187..c97a895471 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/element/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.element; +package com.djrapitops.plan.data.element; import java.io.Serializable; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/element/HealthNotes.java b/Plan/src/main/java/com/djrapitops/plan/data/element/HealthNotes.java index bf2e1b6ce7..9685964942 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/element/HealthNotes.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/element/HealthNotes.java @@ -2,18 +2,18 @@ * 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.element; - +package com.djrapitops.plan.data.element; + +import com.djrapitops.plan.data.AnalysisData; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.container.StickyData; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.TimeAmount; -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.container.StickyData; -import main.java.com.djrapitops.plan.data.container.TPS; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; -import main.java.com.djrapitops.plan.utilities.html.Html; import java.util.*; import java.util.stream.Collectors; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java b/Plan/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java index 6d352e7bf6..e52ea0c8ac 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/element/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.element; +package com.djrapitops.plan.data.element; import java.io.Serializable; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java b/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java index b825b0606b..64e7542087 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java @@ -2,10 +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.element; +package com.djrapitops.plan.data.element; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.Html; import java.io.Serializable; import java.util.ArrayList; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/plugin/BanData.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/BanData.java index 15a77324c7..3f3b035c8e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/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.plugin; +package com.djrapitops.plan.data.plugin; import java.util.Collection; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java index 7482641ec4..87dd725a20 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/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.plugin; +package 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/plugin/HookHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java index 8823173be7..915821f5c1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java @@ -1,9 +1,9 @@ -package main.java.com.djrapitops.plan.data.plugin; +package com.djrapitops.plan.data.plugin; +import com.djrapitops.plan.Plan; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.Bridge; -import main.java.com.djrapitops.plan.Plan; import java.util.ArrayList; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java index 8c2fbf6890..1889c17e8a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java @@ -1,9 +1,9 @@ -package main.java.com.djrapitops.plan.data.plugin; +package com.djrapitops.plan.data.plugin; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.utilities.html.Html; 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; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java index 507df75508..aa00b0310d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.data.plugin; +package com.djrapitops.plan.data.plugin; +import com.djrapitops.plan.systems.file.config.ConfigSystem; import com.djrapitops.plugin.api.config.ConfigNode; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/time/GMTimes.java b/Plan/src/main/java/com/djrapitops/plan/data/time/GMTimes.java index 76d3938872..b31ab5e8cb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/time/GMTimes.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/time/GMTimes.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data.time; +package com.djrapitops.plan.data.time; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java b/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java index 2be496f5de..4b46453501 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data.time; +package com.djrapitops.plan.data.time; import com.djrapitops.plugin.utilities.Verify; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/Plan/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java b/Plan/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java index 1d4144494d..a49ebc7847 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.data.time; +package com.djrapitops.plan.data.time; -import main.java.com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.MiscUtils; import java.util.HashMap; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/Container.java b/Plan/src/main/java/com/djrapitops/plan/database/Container.java index ed9cd2002c..8e1885f724 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/Container.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/Container.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.database; +package com.djrapitops.plan.database; /** * Class to contain objects in the batches. diff --git a/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java b/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java index 61b7aef6de..c01a9d36b5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.database; +package com.djrapitops.plan.database; import java.util.ArrayList; import java.util.Collection; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/Database.java b/Plan/src/main/java/com/djrapitops/plan/database/Database.java index 13e6c64bb4..e0ad1310e1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/Database.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/Database.java @@ -1,9 +1,9 @@ -package main.java.com.djrapitops.plan.database; +package com.djrapitops.plan.database; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.database.tables.*; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.database.tables.*; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/databases/MySQLDB.java b/Plan/src/main/java/com/djrapitops/plan/database/databases/MySQLDB.java index 79d8c7b11f..9d9c75e497 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/databases/MySQLDB.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/databases/MySQLDB.java @@ -1,8 +1,7 @@ -package main.java.com.djrapitops.plan.database.databases; +package com.djrapitops.plan.database.databases; +import com.djrapitops.plan.settings.Settings; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.settings.Settings; import org.apache.commons.dbcp2.BasicDataSource; import java.sql.Connection; @@ -19,7 +18,7 @@ public class MySQLDB extends SQLDB { * Setups the {@link BasicDataSource} */ @Override - public void setupDataSource() throws DatabaseInitException { + public void setupDataSource() { dataSource = new BasicDataSource(); dataSource.setDriverClassName("com.mysql.jdbc.Driver"); 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 0cedfd6ec2..ed544d912c 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 @@ -1,19 +1,19 @@ -package main.java.com.djrapitops.plan.database.databases; - +package com.djrapitops.plan.database.databases; + +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.container.*; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.tables.*; +import com.djrapitops.plan.database.tables.move.Version8TransferTable; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.ITask; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -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; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.apache.commons.dbcp2.BasicDataSource; import java.sql.Connection; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLiteDB.java b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLiteDB.java index d191fe4a50..90468f3f97 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLiteDB.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLiteDB.java @@ -1,11 +1,11 @@ -package main.java.com.djrapitops.plan.database.databases; +package com.djrapitops.plan.database.databases; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.ITask; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.apache.commons.dbcp2.BasicDataSource; import java.io.File; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/processing/ExecStatement.java b/Plan/src/main/java/com/djrapitops/plan/database/processing/ExecStatement.java index f4008f3c8b..0efe6c60bc 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/processing/ExecStatement.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/processing/ExecStatement.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.database.processing; +package com.djrapitops.plan.database.processing; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryAllStatement.java b/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryAllStatement.java index 2be980d434..e7d0247ff0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryAllStatement.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryAllStatement.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.database.processing; +package com.djrapitops.plan.database.processing; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryStatement.java b/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryStatement.java index 1778d8fa02..e024374bbf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryStatement.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/processing/QueryStatement.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.database.processing; +package com.djrapitops.plan.database.processing; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/Insert.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/Insert.java index 9b2d1d38ee..7acba858a7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/Insert.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/Insert.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.database.sql; +package com.djrapitops.plan.database.sql; public class Insert extends SqlParser { diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java index b25784b26f..142f36a0bf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.database.sql; +package com.djrapitops.plan.database.sql; public class Select extends WhereParser { diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java index ae6dbe215a..c9b5520602 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.database.sql; +package com.djrapitops.plan.database.sql; public class Sql { public static final String INT = "integer"; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/SqlParser.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/SqlParser.java index 1babf6cf47..9110e135a3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/SqlParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/SqlParser.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.database.sql; +package com.djrapitops.plan.database.sql; /** * Class for parsing different SQL strings. diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/TableSqlParser.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/TableSqlParser.java index ccf130ce8a..0f286a8915 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/TableSqlParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/TableSqlParser.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.database.sql; +package com.djrapitops.plan.database.sql; /** * SqlParser Class for parsing table creation, removal and modification statements. diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/Update.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/Update.java index e726a7a9c5..183f0a2fbb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/Update.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/Update.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.database.sql; +package com.djrapitops.plan.database.sql; /** * @author Fuzzlemann diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/WhereParser.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/WhereParser.java index 779af8f977..d38bb0ce36 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/WhereParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/WhereParser.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.database.sql; +package com.djrapitops.plan.database.sql; /** * @author Fuzzlemann diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/Actions.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/Actions.java index 8375cc7909..e243276cf4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/Actions.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/Actions.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.database.tables; +package com.djrapitops.plan.database.tables; import org.apache.commons.lang3.text.WordUtils; 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 c8e362e828..6c5b688f9d 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 @@ -2,19 +2,19 @@ * 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; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; 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.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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java index 301670a197..0161f7db27 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java @@ -1,14 +1,14 @@ -package main.java.com.djrapitops.plan.database.tables; - -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; 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 0f12bd9299..e75af6596c 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 @@ -1,15 +1,15 @@ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; 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 ebbae56e20..129f17b413 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 @@ -1,15 +1,15 @@ -package main.java.com.djrapitops.plan.database.tables; +package com.djrapitops.plan.database.tables; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java index d7780282a6..04ad76e4f1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java @@ -1,14 +1,14 @@ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; 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.database.databases.SQLDB; -import main.java.com.djrapitops.plan.database.processing.ExecStatement; -import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java index d55ca50e01..2c34dc0ce9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java @@ -3,19 +3,19 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Insert; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.WebUser; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Insert; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java index 9074027855..ef905b5676 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java @@ -2,16 +2,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; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.*; +import com.djrapitops.plan.systems.info.server.ServerInfo; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.*; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -413,7 +413,7 @@ public int getMaxPlayers() throws SQLException { return query(new QueryStatement(sql) { @Override - public void prepare(PreparedStatement statement) throws SQLException { + public void prepare(PreparedStatement statement) { } 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 36158a17ef..a9a98e8cb1 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 @@ -1,16 +1,16 @@ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; 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.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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; 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 137d605ac5..e144d4ae9f 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 @@ -1,18 +1,18 @@ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; +import com.djrapitops.plan.systems.info.server.ServerInfo; +import com.djrapitops.plan.utilities.MiscUtils; 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.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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java index cdade6ee69..0abde340b5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java @@ -1,12 +1,12 @@ -package main.java.com.djrapitops.plan.database.tables; +package com.djrapitops.plan.database.tables; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.utilities.Verify; import com.google.common.base.Objects; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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.QueryStatement; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.Connection; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java index ec041ebe33..cba453050c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java @@ -1,7 +1,7 @@ -package main.java.com.djrapitops.plan.database.tables; +package com.djrapitops.plan.database.tables; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; import java.sql.PreparedStatement; import java.sql.SQLException; 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 0889f5e7ae..14ecd642f0 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 @@ -2,22 +2,22 @@ * 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; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; +import com.djrapitops.plan.database.sql.Update; +import com.djrapitops.plan.utilities.MiscUtils; 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.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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; -import main.java.com.djrapitops.plan.database.sql.Update; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.PreparedStatement; import java.sql.ResultSet; 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 908def93d7..abfdbb7f4b 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 @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.*; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java index bd1218d657..d398549d8c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java @@ -1,12 +1,12 @@ -package main.java.com.djrapitops.plan.database.tables; +package com.djrapitops.plan.database.tables; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java index 71383a0ca9..ec9a8e53e5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java @@ -1,14 +1,14 @@ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.PreparedStatement; import java.sql.ResultSet; 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 1e5f29b796..fec3b97c82 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 @@ -1,17 +1,17 @@ -package main.java.com.djrapitops.plan.database.tables; - +package com.djrapitops.plan.database.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.time.GMTimes; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Sql; +import com.djrapitops.plan.database.sql.TableSqlParser; 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.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; -import main.java.com.djrapitops.plan.database.processing.ExecStatement; -import main.java.com.djrapitops.plan.database.processing.QueryAllStatement; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Sql; -import main.java.com.djrapitops.plan.database.sql.TableSqlParser; import java.sql.PreparedStatement; import java.sql.ResultSet; 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 fc8588aee6..e328d24178 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 @@ -2,17 +2,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.move; - +package com.djrapitops.plan.database.tables.move; + +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.tables.ServerTable; +import com.djrapitops.plan.database.tables.Table; +import com.djrapitops.plan.database.tables.UsersTable; +import com.djrapitops.plan.systems.info.server.ServerInfo; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.tables.Table; -import main.java.com.djrapitops.plan.database.tables.UsersTable; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; import java.sql.SQLException; import java.util.List; @@ -54,7 +53,7 @@ public BatchOperationTable(Database database) { } @Override - public void createTable() throws DBCreateTableException { + public void createTable() { throw new IllegalStateException("Method not supposed to be used on this table."); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/move/Version8TransferTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/move/Version8TransferTable.java index aacae2e1b4..bce666da9c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/move/Version8TransferTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/move/Version8TransferTable.java @@ -2,13 +2,13 @@ * 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.move; +package com.djrapitops.plan.database.tables.move; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.tables.*; import com.djrapitops.plugin.api.Benchmark; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.database.tables.*; import java.sql.SQLException; import java.util.Optional; @@ -34,7 +34,7 @@ public Version8TransferTable(SQLDB db, boolean usingMySQL) throws SQLException { } @Override - public void createTable() throws DBCreateTableException { + public void createTable() { throw new IllegalStateException("Method not supposed to be used on this table."); } diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/Permissions.java b/Plan/src/main/java/com/djrapitops/plan/settings/Permissions.java index 27397d8a60..05eb804c7b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/Permissions.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/Permissions.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.settings; +package com.djrapitops.plan.settings; /** * Permissions class is used easily check every permission node. diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/ServerSpecificSettings.java b/Plan/src/main/java/com/djrapitops/plan/settings/ServerSpecificSettings.java index 672eea3bec..416894c336 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/ServerSpecificSettings.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/ServerSpecificSettings.java @@ -2,13 +2,13 @@ * 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.settings; +package com.djrapitops.plan.settings; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; import com.djrapitops.plugin.api.config.Config; 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.PlanBungee; import java.io.IOException; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java b/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java index 54302be4b8..ae1eeca8b4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.settings; +package com.djrapitops.plan.settings; +import com.djrapitops.plan.systems.file.config.ConfigSystem; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.config.Config; -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java b/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java index 303cfd4825..fcc51ecce5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java @@ -2,13 +2,13 @@ * 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.settings; +package com.djrapitops.plan.settings; +import com.djrapitops.plan.systems.file.config.ConfigSystem; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.api.config.ConfigNode; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; import java.io.IOException; import java.util.HashMap; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java index 4dc7292fdf..edba744461 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java @@ -1,20 +1,20 @@ -package main.java.com.djrapitops.plan.settings.locale; - +package com.djrapitops.plan.settings.locale; + +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.file.FileSystem; +import com.djrapitops.plan.systems.file.config.ConfigSystem; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.comparators.LocaleEntryComparator; +import com.djrapitops.plan.utilities.comparators.StringLengthComparator; +import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.settings.ColorScheme; import com.djrapitops.plugin.settings.DefaultMessages; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.settings.Permissions; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.file.FileSystem; -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.comparators.LocaleEntryComparator; -import main.java.com.djrapitops.plan.utilities.comparators.StringLengthComparator; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; -import main.java.com.djrapitops.plan.utilities.html.Html; import java.io.File; import java.io.FileNotFoundException; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Message.java b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Message.java index 80edfdd81d..4d60107f32 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Message.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Message.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.settings.locale; +package com.djrapitops.plan.settings.locale; import com.djrapitops.plugin.utilities.Verify; import org.apache.commons.lang3.text.StrSubstitutor; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Msg.java b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Msg.java index c2c5b15044..41d04c4373 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Msg.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Msg.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.settings.locale; +package com.djrapitops.plan.settings.locale; import java.util.Arrays; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/theme/PlanColorScheme.java b/Plan/src/main/java/com/djrapitops/plan/settings/theme/PlanColorScheme.java index 90d35e85ae..9dfcee5c1a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/theme/PlanColorScheme.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/theme/PlanColorScheme.java @@ -2,11 +2,11 @@ * 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.settings.theme; +package com.djrapitops.plan.settings.theme; +import com.djrapitops.plan.settings.Settings; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.settings.ColorScheme; -import main.java.com.djrapitops.plan.settings.Settings; /** * ColorScheme that uses values in config settings specific to Plan or PlanBungee. diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/theme/Theme.java b/Plan/src/main/java/com/djrapitops/plan/settings/theme/Theme.java index 6cc8474f83..32f0c0af7c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/theme/Theme.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/theme/Theme.java @@ -2,15 +2,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.settings.theme; +package com.djrapitops.plan.settings.theme; +import com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.SubSystem; +import com.djrapitops.plan.systems.Systems; import com.djrapitops.plugin.api.utility.EnumUtility; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.SubSystem; -import main.java.com.djrapitops.plan.systems.Systems; import java.io.IOException; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeConfig.java b/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeConfig.java index 3b940e3b34..aeff185d09 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeConfig.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeConfig.java @@ -2,13 +2,13 @@ * 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.settings.theme; +package com.djrapitops.plan.settings.theme; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; import java.io.File; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java b/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java index dbd347c151..42f475838d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.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.settings.theme; +package com.djrapitops.plan.settings.theme; /** * Enum class used for getting the Html colors that match the config settings. diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/SubSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/SubSystem.java index f8e03569f5..b859580455 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/SubSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/SubSystem.java @@ -2,9 +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.systems; +package com.djrapitops.plan.systems; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.api.exceptions.PlanEnableException; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java b/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java index 3b0f8547bd..2abdfcf124 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java @@ -2,25 +2,25 @@ * 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.systems; - +package com.djrapitops.plan.systems; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.systems.file.FileSystem; +import com.djrapitops.plan.systems.file.config.ConfigSystem; +import com.djrapitops.plan.systems.file.config.PlanBungeeConfigSystem; +import com.djrapitops.plan.systems.file.config.PlanConfigSystem; +import com.djrapitops.plan.systems.file.database.DBSystem; +import com.djrapitops.plan.systems.file.database.PlanBungeeDBSystem; +import com.djrapitops.plan.systems.file.database.PlanDBSystem; +import com.djrapitops.plan.systems.tasks.PlanBungeeTaskSystem; +import com.djrapitops.plan.systems.tasks.PlanTaskSystem; +import com.djrapitops.plan.systems.tasks.TaskSystem; +import com.djrapitops.plan.systems.update.VersionCheckSystem; +import com.djrapitops.plan.systems.webserver.WebServerSystem; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.settings.theme.Theme; -import main.java.com.djrapitops.plan.systems.file.FileSystem; -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; -import main.java.com.djrapitops.plan.systems.file.config.PlanBungeeConfigSystem; -import main.java.com.djrapitops.plan.systems.file.config.PlanConfigSystem; -import main.java.com.djrapitops.plan.systems.file.database.DBSystem; -import main.java.com.djrapitops.plan.systems.file.database.PlanBungeeDBSystem; -import main.java.com.djrapitops.plan.systems.file.database.PlanDBSystem; -import main.java.com.djrapitops.plan.systems.tasks.PlanBungeeTaskSystem; -import main.java.com.djrapitops.plan.systems.tasks.PlanTaskSystem; -import main.java.com.djrapitops.plan.systems.tasks.TaskSystem; -import main.java.com.djrapitops.plan.systems.update.VersionCheckSystem; -import main.java.com.djrapitops.plan.systems.webserver.WebServerSystem; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.apache.commons.lang3.ArrayUtils; /** diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java b/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java index a14d30f76f..4aad6c76ed 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.systems.cache; +package com.djrapitops.plan.systems.cache; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.Database; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.Database; import java.sql.SQLException; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/cache/GeolocationCache.java b/Plan/src/main/java/com/djrapitops/plan/systems/cache/GeolocationCache.java index e1d0b9971b..2c58f3d38e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/cache/GeolocationCache.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/cache/GeolocationCache.java @@ -1,12 +1,12 @@ -package main.java.com.djrapitops.plan.systems.cache; +package com.djrapitops.plan.systems.cache; +import com.djrapitops.plan.utilities.MiscUtils; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.GeoIp2Exception; import com.maxmind.geoip2.model.CountryResponse; import com.maxmind.geoip2.record.Country; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.io.File; import java.io.FileOutputStream; 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 738b1d2d8c..95740524d1 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 @@ -1,10 +1,10 @@ -package main.java.com.djrapitops.plan.systems.cache; +package com.djrapitops.plan.systems.cache; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.container.Session; -import main.java.com.djrapitops.plan.systems.processing.Processor; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.SQLException; import java.util.HashMap; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/file/FileSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/FileSystem.java index ed5b489463..2b2de19165 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/file/FileSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/FileSystem.java @@ -2,14 +2,13 @@ * 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.systems.file; +package com.djrapitops.plan.systems.file; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.systems.SubSystem; -import main.java.com.djrapitops.plan.systems.Systems; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.systems.SubSystem; +import com.djrapitops.plan.systems.Systems; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.file.FileUtil; import java.io.File; import java.io.IOException; @@ -54,7 +53,7 @@ public static List readFromResource(String fileName) throws IOException } @Override - public void init() throws PlanEnableException { + public void init() { dataFolder.mkdirs(); configFile = new File(dataFolder, "config.yml"); } diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/file/config/ConfigSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/ConfigSystem.java index ec375c1d6b..6bb45d30d4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/file/config/ConfigSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/ConfigSystem.java @@ -2,14 +2,14 @@ * 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.systems.file.config; +package com.djrapitops.plan.systems.file.config; +import com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.systems.SubSystem; +import com.djrapitops.plan.systems.Systems; +import com.djrapitops.plan.systems.file.FileSystem; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.systems.SubSystem; -import main.java.com.djrapitops.plan.systems.Systems; -import main.java.com.djrapitops.plan.systems.file.FileSystem; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanBungeeConfigSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanBungeeConfigSystem.java index 6c0603db32..50b925f7aa 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanBungeeConfigSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanBungeeConfigSystem.java @@ -2,9 +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.systems.file.config; +package com.djrapitops.plan.systems.file.config; -import main.java.com.djrapitops.plan.systems.file.FileSystem; +import com.djrapitops.plan.systems.file.FileSystem; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanConfigSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanConfigSystem.java index 4999cbc8c3..61959f718e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanConfigSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanConfigSystem.java @@ -2,9 +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.systems.file.config; +package com.djrapitops.plan.systems.file.config; -import main.java.com.djrapitops.plan.systems.file.FileSystem; +import com.djrapitops.plan.systems.file.FileSystem; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/file/database/DBSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/DBSystem.java index eb69607d45..148db067e5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/file/database/DBSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/DBSystem.java @@ -2,19 +2,19 @@ * 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.systems.file.database; +package com.djrapitops.plan.systems.file.database; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.SubSystem; +import com.djrapitops.plan.systems.Systems; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.SubSystem; -import main.java.com.djrapitops.plan.systems.Systems; import java.sql.SQLException; import java.util.HashSet; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanBungeeDBSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanBungeeDBSystem.java index 0dde6d6874..25e2eb9ecb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanBungeeDBSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanBungeeDBSystem.java @@ -2,10 +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.systems.file.database; +package com.djrapitops.plan.systems.file.database; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.database.databases.MySQLDB; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.database.databases.MySQLDB; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanDBSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanDBSystem.java index b6405b8b00..d367247b1f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanDBSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanDBSystem.java @@ -2,12 +2,12 @@ * 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.systems.file.database; +package com.djrapitops.plan.systems.file.database; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.database.databases.MySQLDB; -import main.java.com.djrapitops.plan.database.databases.SQLiteDB; -import main.java.com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.database.databases.MySQLDB; +import com.djrapitops.plan.database.databases.SQLiteDB; +import com.djrapitops.plan.settings.Settings; /** * //TODO Class Javadoc Comment 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 4404e3fad1..0702d00787 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 @@ -2,39 +2,39 @@ * 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.systems.info; - +package com.djrapitops.plan.systems.info; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.*; +import com.djrapitops.plan.command.commands.AnalyzeCommand; +import com.djrapitops.plan.data.AnalysisData; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.info.parsing.AnalysisPageParser; +import com.djrapitops.plan.systems.info.parsing.InspectPageParser; +import com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.systems.webserver.WebServer; +import com.djrapitops.plan.systems.webserver.WebServerSystem; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; +import com.djrapitops.plan.systems.webserver.response.*; +import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bungee.*; +import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.Analysis; +import com.djrapitops.plan.utilities.file.export.HtmlExport; +import com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plan.utilities.html.structure.InspectPluginsTabContentCreator; import com.djrapitops.plugin.api.utility.log.ErrorLogger; import com.djrapitops.plugin.api.utility.log.Log; -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.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; -import main.java.com.djrapitops.plan.systems.info.parsing.AnalysisPageParser; -import main.java.com.djrapitops.plan.systems.info.parsing.InspectPageParser; -import main.java.com.djrapitops.plan.systems.processing.Processor; -import main.java.com.djrapitops.plan.systems.webserver.WebServer; -import main.java.com.djrapitops.plan.systems.webserver.WebServerSystem; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; -import main.java.com.djrapitops.plan.systems.webserver.response.*; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bungee.*; -import main.java.com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.analysis.Analysis; -import main.java.com.djrapitops.plan.utilities.file.export.HtmlExport; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; -import main.java.com.djrapitops.plan.utilities.html.structure.InspectPluginsTabContentCreator; import java.io.IOException; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java index 3a16b44d59..9fba8fa477 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java @@ -2,32 +2,32 @@ * 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.systems.info; - +package com.djrapitops.plan.systems.info; + +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.api.exceptions.WebAPIConnectionFailException; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.api.exceptions.WebAPINotFoundException; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.info.parsing.NetworkPageParser; +import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; +import com.djrapitops.plan.systems.info.server.ServerInfo; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; +import com.djrapitops.plan.systems.webserver.response.*; +import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.IsOnlineWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bungee.RequestPluginsTabWebAPI; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.file.export.HtmlExport; +import com.djrapitops.plan.utilities.html.HtmlStructure; import com.djrapitops.plugin.api.utility.log.ErrorLogger; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.api.exceptions.ParseException; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIConnectionFailException; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.api.exceptions.WebAPINotFoundException; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.info.parsing.NetworkPageParser; -import main.java.com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; -import main.java.com.djrapitops.plan.systems.webserver.response.*; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.IsOnlineWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bungee.RequestPluginsTabWebAPI; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.file.export.HtmlExport; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; import java.io.IOException; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/ImporterManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/ImporterManager.java index 980e84d616..934341f793 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/ImporterManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/ImporterManager.java @@ -2,9 +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.systems.info; +package com.djrapitops.plan.systems.info; -import main.java.com.djrapitops.plan.systems.processing.importing.importers.Importer; +import com.djrapitops.plan.systems.processing.importing.importers.Importer; import java.util.ArrayList; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java index 3243be6b5b..bfd2d64f1b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java @@ -2,14 +2,14 @@ * 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.systems.info; +package com.djrapitops.plan.systems.info; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.cache.SessionCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; import com.djrapitops.plugin.command.ISender; -import main.java.com.djrapitops.plan.api.exceptions.ParseException; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.cache.SessionCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; import java.io.IOException; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/AnalysisPageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/AnalysisPageParser.java index 4df177d786..0dc2b98d44 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/AnalysisPageParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/AnalysisPageParser.java @@ -2,16 +2,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.systems.info.parsing; - +package com.djrapitops.plan.systems.info.parsing; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.data.AnalysisData; +import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.utilities.html.HtmlUtils; import com.djrapitops.plugin.api.Check; -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.api.exceptions.ParseException; -import main.java.com.djrapitops.plan.data.AnalysisData; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; import java.io.IOException; 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 8b946b95df..81d167ad7f 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 @@ -2,37 +2,37 @@ * 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.systems.info.parsing; - +package com.djrapitops.plan.systems.info.parsing; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.utilities.comparators.SessionLengthComparator; +import com.djrapitops.plan.utilities.comparators.SessionStartComparator; +import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plan.utilities.html.HtmlUtils; +import com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; +import com.djrapitops.plan.utilities.html.graphs.line.ServerPreferencePie; +import com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; +import com.djrapitops.plan.utilities.html.structure.ServerAccordionCreator; +import com.djrapitops.plan.utilities.html.tables.ActionsTableCreator; +import com.djrapitops.plan.utilities.html.tables.IpTableCreator; +import com.djrapitops.plan.utilities.html.tables.NicknameTableCreator; import com.djrapitops.plugin.api.Benchmark; 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.PlayerProfile; -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.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; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; -import main.java.com.djrapitops.plan.utilities.comparators.SessionLengthComparator; -import main.java.com.djrapitops.plan.utilities.comparators.SessionStartComparator; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.ServerPreferencePie; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; -import main.java.com.djrapitops.plan.utilities.html.structure.ServerAccordionCreator; -import main.java.com.djrapitops.plan.utilities.html.tables.ActionsTableCreator; -import main.java.com.djrapitops.plan.utilities.html.tables.IpTableCreator; -import main.java.com.djrapitops.plan.utilities.html.tables.NicknameTableCreator; import java.io.IOException; import java.util.*; 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 a81060b193..55aabe8d8e 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 @@ -2,25 +2,25 @@ * 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.systems.info.parsing; - +package com.djrapitops.plan.systems.info.parsing; + +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.systems.info.BungeeInformationManager; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plan.utilities.html.HtmlUtils; +import com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraph; 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.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.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; -import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraph; import java.sql.SQLException; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/PageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/PageParser.java index f0e77140ec..b4eb1be73b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/PageParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/PageParser.java @@ -2,9 +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.systems.info.parsing; +package com.djrapitops.plan.systems.info.parsing; -import main.java.com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.api.exceptions.ParseException; import java.io.Serializable; import java.util.HashMap; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/UrlParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/UrlParser.java index 4f83a3a153..8373f71162 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/UrlParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/UrlParser.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.systems.info.parsing; +package com.djrapitops.plan.systems.info.parsing; /** * Used for parsing URL strings. diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java index 170b2219f8..247cf590c0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java @@ -2,16 +2,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.systems.info.server; +package com.djrapitops.plan.systems.info.server; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.ServerVariableHolder; +import com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.tables.ServerTable; +import com.djrapitops.plan.settings.Settings; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.ServerVariableHolder; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.database.tables.ServerTable; -import main.java.com.djrapitops.plan.settings.Settings; import java.io.IOException; import java.sql.SQLException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java index 07ce78d552..179ccf8d01 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java @@ -2,20 +2,20 @@ * 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.systems.info.server; - +package com.djrapitops.plan.systems.info.server; + +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.ServerVariableHolder; +import com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.tables.ServerTable; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.ConfigurationWebAPI; +import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.ServerVariableHolder; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.database.tables.ServerTable; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.ConfigurationWebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; import java.sql.SQLException; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.java index 18879d431b..59ca572e58 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.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.systems.info.server; +package com.djrapitops.plan.systems.info.server; import java.util.Objects; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfoFile.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfoFile.java index 509b78e3a5..dd3bbda541 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfoFile.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfoFile.java @@ -2,13 +2,13 @@ * 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.systems.info.server; +package com.djrapitops.plan.systems.info.server; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.api.config.Config; 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.utilities.file.FileUtil; import java.io.File; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/BungeePlayerListener.java b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/BungeePlayerListener.java index 7220cbdbe7..c5f728c159 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/BungeePlayerListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/BungeePlayerListener.java @@ -2,12 +2,12 @@ * 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.systems.listeners; +package com.djrapitops.plan.systems.listeners; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.systems.processing.player.BungeePlayerRegisterProcessor; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.systems.processing.player.BungeePlayerRegisterProcessor; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.plugin.Listener; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanChatListener.java b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanChatListener.java index f96c8e1478..d965a499f8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanChatListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanChatListener.java @@ -1,9 +1,9 @@ -package main.java.com.djrapitops.plan.systems.listeners; +package com.djrapitops.plan.systems.listeners; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.processing.player.NameProcessor; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.processing.player.NameProcessor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanCommandPreprocessListener.java b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanCommandPreprocessListener.java index 8fb3816dd7..9d83293a70 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanCommandPreprocessListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanCommandPreprocessListener.java @@ -1,10 +1,10 @@ -package main.java.com.djrapitops.plan.systems.listeners; +package com.djrapitops.plan.systems.listeners; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.processing.CommandProcessor; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.settings.Permissions; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.processing.CommandProcessor; import org.bukkit.command.Command; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanDeathEventListener.java b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanDeathEventListener.java index 87bdb4bc75..5be636f7a7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanDeathEventListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanDeathEventListener.java @@ -1,11 +1,11 @@ -package main.java.com.djrapitops.plan.systems.listeners; +package com.djrapitops.plan.systems.listeners; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.systems.processing.player.DeathProcessor; +import com.djrapitops.plan.systems.processing.player.KillProcessor; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Format; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.systems.processing.player.DeathProcessor; -import main.java.com.djrapitops.plan.systems.processing.player.KillProcessor; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.bukkit.Material; import org.bukkit.entity.*; import org.bukkit.event.EventHandler; 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 f8821abdaf..26c94492c2 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,10 +1,10 @@ -package main.java.com.djrapitops.plan.systems.listeners; +package com.djrapitops.plan.systems.listeners; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.settings.WorldAliasSettings; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -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; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; 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 f3a6faf680..7ddbfbab1a 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 @@ -1,14 +1,14 @@ -package main.java.com.djrapitops.plan.systems.listeners; - +package com.djrapitops.plan.systems.listeners; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.processing.info.NetworkPageUpdateProcessor; +import com.djrapitops.plan.systems.processing.player.*; +import com.djrapitops.plan.systems.tasks.TaskSystem; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.systems.NotificationCenter; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -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.*; -import main.java.com.djrapitops.plan.systems.tasks.TaskSystem; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; 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 5ed57326b8..e23e5abaf3 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,10 +1,10 @@ -package main.java.com.djrapitops.plan.systems.listeners; +package com.djrapitops.plan.systems.listeners; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.settings.WorldAliasSettings; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -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; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/CommandProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/CommandProcessor.java index 9f1ad0c88b..585b95243e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/CommandProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/CommandProcessor.java @@ -2,10 +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.systems.processing; +package com.djrapitops.plan.systems.processing; +import com.djrapitops.plan.Plan; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; import java.sql.SQLException; 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 88ce0f27b5..124f1e7cd9 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 @@ -2,15 +2,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.systems.processing; - +package com.djrapitops.plan.systems.processing; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.database.tables.Actions; +import com.djrapitops.plan.systems.processing.player.PlayerProcessor; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.html.HtmlUtils; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -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; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; import java.sql.SQLException; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/Processor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/Processor.java index 2e2d30fba7..6529d5dddd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/Processor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/Processor.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.systems.processing; +package com.djrapitops.plan.systems.processing; /** * Abstract class for processing different objects using Generics. 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 12d57d154d..2d00ca66d7 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 @@ -2,12 +2,12 @@ * 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.systems.processing; +package com.djrapitops.plan.systems.processing; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; import com.djrapitops.plugin.api.utility.log.Log; -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; import java.sql.SQLException; import java.util.List; 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 cc6d791ef3..f99196d5ac 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 @@ -2,9 +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.systems.processing.importing; +package com.djrapitops.plan.systems.processing.importing; -import main.java.com.djrapitops.plan.data.container.TPS; +import 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 5c2ab0d6bb..3941da6a94 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 @@ -2,10 +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.systems.processing.importing; +package com.djrapitops.plan.systems.processing.importing; -import main.java.com.djrapitops.plan.data.container.PlayerKill; -import main.java.com.djrapitops.plan.data.time.GMTimes; +import com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.data.time.GMTimes; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportRefiner.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportRefiner.java index 735f09ef80..955ea3c5c5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportRefiner.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/UserImportRefiner.java @@ -2,12 +2,12 @@ * 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.systems.processing.importing; +package com.djrapitops.plan.systems.processing.importing; +import com.djrapitops.plan.Plan; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.UUIDFetcher; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; import org.bukkit.OfflinePlayer; import org.bukkit.World; 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 b83ff81f3d..dc1665cdec 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 @@ -2,23 +2,23 @@ * 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.systems.processing.importing.importers; - +package com.djrapitops.plan.systems.processing.importing.importers; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.systems.cache.GeolocationCache; +import com.djrapitops.plan.systems.processing.importing.ServerImportData; +import com.djrapitops.plan.systems.processing.importing.UserImportData; +import com.djrapitops.plan.systems.processing.importing.UserImportRefiner; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Benchmark; 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.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; -import main.java.com.djrapitops.plan.systems.processing.importing.ServerImportData; -import main.java.com.djrapitops.plan.systems.processing.importing.UserImportData; -import main.java.com.djrapitops.plan.systems.processing.importing.UserImportRefiner; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.SQLException; import java.util.*; @@ -50,7 +50,7 @@ public final void processImport() { new ImportExecutorHelper() { @Override - void execute() throws SQLException { + void execute() { Benchmark.start(serverBenchmarkName); processServerData(); Benchmark.stop(serverBenchmarkName); diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/OfflinePlayerImporter.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/OfflinePlayerImporter.java index 5d4c7f7649..439db70db9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/OfflinePlayerImporter.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/importers/OfflinePlayerImporter.java @@ -2,10 +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.systems.processing.importing.importers; +package com.djrapitops.plan.systems.processing.importing.importers; -import main.java.com.djrapitops.plan.systems.processing.importing.ServerImportData; -import main.java.com.djrapitops.plan.systems.processing.importing.UserImportData; +import com.djrapitops.plan.systems.processing.importing.ServerImportData; +import com.djrapitops.plan.systems.processing.importing.UserImportData; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/BungeePluginChannelSenderProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/BungeePluginChannelSenderProcessor.java index 90f563635d..3b51cb1c1e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/BungeePluginChannelSenderProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/BungeePluginChannelSenderProcessor.java @@ -2,11 +2,11 @@ * 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.systems.processing.info; +package com.djrapitops.plan.systems.processing.info; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.systems.processing.Processor; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.systems.processing.Processor; import org.bukkit.entity.Player; import java.io.ByteArrayOutputStream; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/InspectCacheRequestProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/InspectCacheRequestProcessor.java index f49cfe9e6a..506fb4808d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/InspectCacheRequestProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/InspectCacheRequestProcessor.java @@ -2,17 +2,17 @@ * 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.systems.processing.info; - +package com.djrapitops.plan.systems.processing.info; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.processing.player.PlayerProcessor; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.command.CommandUtils; import com.djrapitops.plugin.command.ISender; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.processing.player.PlayerProcessor; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/NetworkPageUpdateProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/NetworkPageUpdateProcessor.java index 76efe1d64f..e085b887f5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/NetworkPageUpdateProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/info/NetworkPageUpdateProcessor.java @@ -2,10 +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.systems.processing.info; +package com.djrapitops.plan.systems.processing.info; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.processing.Processor; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BanAndOpProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BanAndOpProcessor.java index d32f892a4d..a008bd3789 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BanAndOpProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BanAndOpProcessor.java @@ -2,10 +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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; +import com.djrapitops.plan.Plan; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; import java.sql.SQLException; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BungeePlayerRegisterProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BungeePlayerRegisterProcessor.java index 15b877b24c..9b15058364 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BungeePlayerRegisterProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BungeePlayerRegisterProcessor.java @@ -2,11 +2,11 @@ * 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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.database.tables.UsersTable; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.database.tables.UsersTable; import java.sql.SQLException; import java.util.UUID; 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 b228cc39fa..c519e51f92 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; +package com.djrapitops.plan.systems.processing.player; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.Plan; +import 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/EndSessionProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/EndSessionProcessor.java index bcc923e984..410d734a58 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/EndSessionProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/EndSessionProcessor.java @@ -2,9 +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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; -import main.java.com.djrapitops.plan.Plan; +import com.djrapitops.plan.Plan; 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 4170b88d84..68751ba956 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 @@ -2,12 +2,12 @@ * 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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.database.tables.Actions; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.container.Action; -import main.java.com.djrapitops.plan.database.tables.Actions; import java.sql.SQLException; import java.util.UUID; 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 a66195c77b..36b16b3955 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 @@ -2,12 +2,12 @@ * 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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.systems.cache.GeolocationCache; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.container.GeoInfo; -import main.java.com.djrapitops.plan.systems.cache.GeolocationCache; import java.sql.SQLException; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KickProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KickProcessor.java index 1760be7bbe..a3d3de46fc 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KickProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KickProcessor.java @@ -2,10 +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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; +import com.djrapitops.plan.Plan; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; import java.sql.SQLException; import java.util.UUID; 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 3142db3102..ceffd2a072 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; +package com.djrapitops.plan.systems.processing.player; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.container.PlayerKill; -import main.java.com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.PlayerKill; +import 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/NameProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.java index 168b4d5995..4dec0a1bb8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.java @@ -2,14 +2,14 @@ * 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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.tables.NicknamesTable; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.processing.NewNickActionProcessor; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.database.tables.NicknamesTable; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.processing.NewNickActionProcessor; import java.sql.SQLException; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/PlayerProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/PlayerProcessor.java index 3ff4f53092..628c88c42c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/PlayerProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/PlayerProcessor.java @@ -2,9 +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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; -import main.java.com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.systems.processing.Processor; import java.util.UUID; 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 e4450e81d5..0d29b2110d 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 @@ -2,16 +2,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.systems.processing.player; +package com.djrapitops.plan.systems.processing.player; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.tables.Actions; +import com.djrapitops.plan.database.tables.UserInfoTable; +import com.djrapitops.plan.database.tables.UsersTable; +import com.djrapitops.plan.systems.processing.Processor; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -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; -import main.java.com.djrapitops.plan.database.tables.UsersTable; -import main.java.com.djrapitops.plan.systems.processing.Processor; import java.sql.SQLException; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java index 47dfdc124c..62268296b0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.systems.queue; +package com.djrapitops.plan.systems.queue; import com.djrapitops.plugin.task.AbsRunnable; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/queue/ProcessingQueue.java b/Plan/src/main/java/com/djrapitops/plan/systems/queue/ProcessingQueue.java index 8d9cc2b0c9..ea95fe833c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/queue/ProcessingQueue.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/queue/ProcessingQueue.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.systems.queue; +package com.djrapitops.plan.systems.queue; +import com.djrapitops.plan.systems.processing.Processor; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.systems.processing.Processor; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Queue.java b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Queue.java index 26796f34d2..126c395be5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Queue.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Queue.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.systems.queue; +package com.djrapitops.plan.systems.queue; import java.util.ArrayList; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Setup.java b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Setup.java index 6bf540dd2c..694da7a744 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Setup.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Setup.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.systems.queue; +package com.djrapitops.plan.systems.queue; import com.djrapitops.plugin.task.RunnableFactory; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanBungeeTaskSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanBungeeTaskSystem.java index 089bd8bfbd..f77cc8e579 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanBungeeTaskSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanBungeeTaskSystem.java @@ -2,13 +2,12 @@ * 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.systems.tasks; +package com.djrapitops.plan.systems.tasks; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.systems.info.BungeeInformationManager; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.task.AbsRunnable; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.systems.info.BungeeInformationManager; /** * //TODO Class Javadoc Comment @@ -18,7 +17,7 @@ public class PlanBungeeTaskSystem extends TaskSystem { @Override - public void init() throws PlanEnableException { + public void init() { registerTasks(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanTaskSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanTaskSystem.java index 7a13633480..fe30f7b49f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanTaskSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/PlanTaskSystem.java @@ -2,20 +2,19 @@ * 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.systems.tasks; +package com.djrapitops.plan.systems.tasks; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.info.InformationManager; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.ITask; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.info.InformationManager; /** * //TODO Class Javadoc Comment @@ -29,7 +28,7 @@ public class PlanTaskSystem extends TaskSystem { private ITask bootAnalysisTask; @Override - public void init() throws PlanEnableException { + public void init() { registerTasks(); } 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 ad24b8d2e0..d8979029e8 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 @@ -1,16 +1,16 @@ -package main.java.com.djrapitops.plan.systems.tasks; - +package com.djrapitops.plan.systems.tasks; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.systems.processing.TPSInsertProcessor; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; 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.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; import org.bukkit.World; import java.lang.management.ManagementFactory; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TaskSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TaskSystem.java index 81d25d95bd..487c20709f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TaskSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TaskSystem.java @@ -2,15 +2,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.systems.tasks; +package com.djrapitops.plan.systems.tasks; +import com.djrapitops.plan.systems.SubSystem; +import com.djrapitops.plan.systems.Systems; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.systems.TaskCenter; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.IRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.systems.SubSystem; -import main.java.com.djrapitops.plan.systems.Systems; -import main.java.com.djrapitops.plan.utilities.MiscUtils; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/update/VersionCheckSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/update/VersionCheckSystem.java index 852f3cfe82..cc2a384761 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/update/VersionCheckSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/update/VersionCheckSystem.java @@ -2,15 +2,14 @@ * 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.systems.update; +package com.djrapitops.plan.systems.update; +import com.djrapitops.plan.systems.SubSystem; +import com.djrapitops.plan.systems.Systems; import com.djrapitops.plugin.api.Priority; import com.djrapitops.plugin.api.systems.NotificationCenter; import com.djrapitops.plugin.api.utility.Version; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.systems.SubSystem; -import main.java.com.djrapitops.plan.systems.Systems; import java.io.IOException; @@ -33,7 +32,7 @@ public static VersionCheckSystem getInstance() { } @Override - public void init() throws PlanEnableException { + public void init() { checkForNewVersion(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIRequestHandler.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIRequestHandler.java index d5d72d1a86..c0e6c79a6a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIRequestHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIRequestHandler.java @@ -2,18 +2,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.systems.webserver; +package com.djrapitops.plan.systems.webserver; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; - -import java.io.IOException; /** * HttpHandler for webserver request management. @@ -29,7 +27,7 @@ public class APIRequestHandler implements HttpHandler { } @Override - public void handle(HttpExchange exchange) throws IOException { + public void handle(HttpExchange exchange) { Headers responseHeaders = exchange.getResponseHeaders(); Request request = new Request(exchange); String requestString = request.toString(); diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java index 24764f02ed..cd31e3e45d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java @@ -2,17 +2,17 @@ * 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.systems.webserver; - +package com.djrapitops.plan.systems.webserver; + +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; +import com.djrapitops.plan.systems.webserver.response.*; +import com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; -import main.java.com.djrapitops.plan.systems.webserver.response.*; -import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.html.Html; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/Request.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/Request.java index d63e41e123..4057f70c28 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/Request.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/Request.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.systems.webserver; +package com.djrapitops.plan.systems.webserver; import com.djrapitops.plugin.utilities.Verify; import com.sun.net.httpserver.Headers; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/RequestHandler.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/RequestHandler.java index 82d5d38138..8959da89de 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/RequestHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/RequestHandler.java @@ -2,17 +2,17 @@ * 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.systems.webserver; +package com.djrapitops.plan.systems.webserver; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.webserver.response.PromptAuthorizationResponse; +import com.djrapitops.plan.systems.webserver.response.Response; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.webserver.response.PromptAuthorizationResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; import java.io.IOException; @@ -30,7 +30,7 @@ public class RequestHandler implements HttpHandler { } @Override - public void handle(HttpExchange exchange) throws IOException { + public void handle(HttpExchange exchange) { Headers responseHeaders = exchange.getResponseHeaders(); Request request = new Request(exchange); String requestString = request.toString(); diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java index fd23b42341..5ab8363e62 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java @@ -2,20 +2,20 @@ * 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.systems.webserver; - +package com.djrapitops.plan.systems.webserver; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.api.exceptions.WebUserAuthException; +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.database.tables.SecurityTable; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; +import com.djrapitops.plan.systems.webserver.response.*; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.PassEncryptUtil; +import com.djrapitops.plan.utilities.uuid.UUIDUtility; 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.api.exceptions.WebUserAuthException; -import main.java.com.djrapitops.plan.data.WebUser; -import main.java.com.djrapitops.plan.database.tables.SecurityTable; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; -import main.java.com.djrapitops.plan.systems.webserver.response.*; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.PassEncryptUtil; -import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility; import java.sql.SQLException; import java.util.Base64; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java index daeb3c1b5e..22d1cb7ca8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java @@ -1,5 +1,14 @@ -package main.java.com.djrapitops.plan.systems.webserver; - +package com.djrapitops.plan.systems.webserver; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.*; +import com.djrapitops.plan.systems.webserver.webapi.bungee.*; +import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; +import com.djrapitops.plan.utilities.html.HtmlUtils; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; @@ -7,15 +16,6 @@ import com.sun.net.httpserver.HttpsConfigurator; import com.sun.net.httpserver.HttpsParameters; import com.sun.net.httpserver.HttpsServer; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.*; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bungee.*; -import main.java.com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; import javax.net.ssl.*; import java.io.File; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServerSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServerSystem.java index 9eaac3d0db..31d58cf46a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServerSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServerSystem.java @@ -2,13 +2,13 @@ * 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.systems.webserver; +package com.djrapitops.plan.systems.webserver; +import com.djrapitops.plan.api.exceptions.PlanEnableException; +import com.djrapitops.plan.systems.SubSystem; +import com.djrapitops.plan.systems.Systems; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Check; -import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException; -import main.java.com.djrapitops.plan.systems.SubSystem; -import main.java.com.djrapitops.plan.systems.Systems; -import main.java.com.djrapitops.plan.utilities.MiscUtils; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageCache.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageCache.java index 5e315669ed..583cb448f9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageCache.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageCache.java @@ -1,9 +1,9 @@ -package main.java.com.djrapitops.plan.systems.webserver.pagecache; +package com.djrapitops.plan.systems.webserver.pagecache; +import com.djrapitops.plan.systems.webserver.response.InspectPageResponse; +import com.djrapitops.plan.systems.webserver.response.Response; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import main.java.com.djrapitops.plan.systems.webserver.response.InspectPageResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; import java.util.Map; import java.util.function.Predicate; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageId.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageId.java index 48021fab50..51d12471c8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageId.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageId.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.systems.webserver.pagecache; +package com.djrapitops.plan.systems.webserver.pagecache; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageLoader.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageLoader.java index 24b4d430ac..dff2a8e92d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageLoader.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageLoader.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.systems.webserver.pagecache; +package com.djrapitops.plan.systems.webserver.pagecache; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.response.Response; /** * This interface is used for providing the method to load the page. diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/AnalysisPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/AnalysisPageResponse.java index be223c8d7f..9af6991c2c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/AnalysisPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/AnalysisPageResponse.java @@ -1,11 +1,11 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.AnalysisData; +import com.djrapitops.plan.systems.info.BukkitInformationManager; +import com.djrapitops.plan.systems.info.InformationManager; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.AnalysisData; -import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; -import main.java.com.djrapitops.plan.systems.info.InformationManager; /** * @author Rsl1122 diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/CSSResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/CSSResponse.java index e0052d7515..247ff3ef49 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/CSSResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/CSSResponse.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; -import main.java.com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.Theme; /** * @author Rsl1122 diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/DebugPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/DebugPageResponse.java index f829c49d28..153cc0affd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/DebugPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/DebugPageResponse.java @@ -2,19 +2,19 @@ * 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.systems.webserver.response; - +package com.djrapitops.plan.systems.webserver.response; + +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.ServerVariableHolder; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; +import com.djrapitops.plan.systems.info.server.ServerInfo; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.ServerVariableHolder; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; -import main.java.com.djrapitops.plan.utilities.html.Html; import java.io.File; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ErrorResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ErrorResponse.java index ef285b5fef..a3ec460f09 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ErrorResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ErrorResponse.java @@ -2,12 +2,12 @@ * 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.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.settings.theme.Theme; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; import org.apache.commons.lang3.text.StrSubstitutor; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/FileResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/FileResponse.java index 94c3b7d66c..6d6dd04141 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/FileResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/FileResponse.java @@ -2,10 +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.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; +import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ForbiddenResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ForbiddenResponse.java index dd6ccb906c..ebf1a42ddd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ForbiddenResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ForbiddenResponse.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.Html; /** * @author Rsl1122 diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InspectPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InspectPageResponse.java index d0de8c86e0..1a12057dba 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InspectPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InspectPageResponse.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; -import main.java.com.djrapitops.plan.api.exceptions.ParseException; -import main.java.com.djrapitops.plan.settings.theme.Theme; -import main.java.com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.systems.info.InformationManager; import org.apache.commons.lang3.text.StrSubstitutor; import java.util.HashMap; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InternalErrorResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InternalErrorResponse.java index bae73882c2..2531158cee 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InternalErrorResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InternalErrorResponse.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.Html; /** * @author Rsl1122 diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/JavaScriptResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/JavaScriptResponse.java index 27f663aab5..04cfef747d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/JavaScriptResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/JavaScriptResponse.java @@ -1,7 +1,7 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; -import main.java.com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; import org.apache.commons.lang3.text.StrSubstitutor; import java.util.HashMap; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/NotFoundResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/NotFoundResponse.java index 58e6d1bf84..e32dd3d6ad 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/NotFoundResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/NotFoundResponse.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.Html; /** * @author Rsl1122 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 4488493011..941cfc8f06 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 @@ -1,22 +1,22 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.utilities.comparators.GeoInfoComparator; +import com.djrapitops.plan.utilities.comparators.UserInfoLastPlayedComparator; +import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.IPlan; -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; -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; -import main.java.com.djrapitops.plan.utilities.comparators.GeoInfoComparator; -import main.java.com.djrapitops.plan.utilities.comparators.UserInfoLastPlayedComparator; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; -import main.java.com.djrapitops.plan.utilities.html.Html; import org.apache.commons.lang3.text.StrSubstitutor; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PromptAuthorizationResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PromptAuthorizationResponse.java index 72f0a6ffa3..ae1de29f72 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PromptAuthorizationResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PromptAuthorizationResponse.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.Html; /** * @author Rsl1122 diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/RedirectResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/RedirectResponse.java index 9a6091c7f6..1b72a2621a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/RedirectResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/RedirectResponse.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; /** * @author Rsl1122 diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/Response.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/Response.java index 03f82ecb2c..b5e07411b8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/Response.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/Response.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ResponseType.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ResponseType.java index f48c54c4ab..78bc835853 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ResponseType.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ResponseType.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.systems.webserver.response; +package com.djrapitops.plan.systems.webserver.response; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/BadRequestResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/BadRequestResponse.java index 74cea78677..18c96c5631 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/BadRequestResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/BadRequestResponse.java @@ -2,9 +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.systems.webserver.response.api; +package com.djrapitops.plan.systems.webserver.response.api; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.response.Response; /** * @author Fuzzlemann diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/JsonResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/JsonResponse.java index b225a22b24..fd4694a1cf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/JsonResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/JsonResponse.java @@ -2,11 +2,11 @@ * 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.systems.webserver.response.api; +package com.djrapitops.plan.systems.webserver.response.api; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.response.ResponseType; import com.google.gson.Gson; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.response.ResponseType; /** * @author Fuzzlemann diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/SuccessResponse.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/SuccessResponse.java index da92ba777c..c69435c30c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/SuccessResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/SuccessResponse.java @@ -2,9 +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.systems.webserver.response.api; +package com.djrapitops.plan.systems.webserver.response.api; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.response.Response; /** * @author Fuzzlemann diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java index 170bfd004b..29ff404010 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java @@ -2,20 +2,20 @@ * 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.systems.webserver.webapi; - +package com.djrapitops.plan.systems.webserver.webapi; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.*; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; +import com.djrapitops.plan.systems.webserver.response.NotFoundResponse; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; +import com.djrapitops.plan.systems.webserver.response.api.SuccessResponse; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.*; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; -import main.java.com.djrapitops.plan.systems.webserver.response.NotFoundResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import javax.net.ssl.*; import java.io.DataOutputStream; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java index cfcc385ada..2048afac5f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java @@ -2,9 +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.systems.webserver.webapi; +package com.djrapitops.plan.systems.webserver.webapi; -import main.java.com.djrapitops.plan.utilities.PassEncryptUtil; +import com.djrapitops.plan.utilities.PassEncryptUtil; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalysisReadyWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalysisReadyWebAPI.java index 4505ce255c..c8af2ab5cf 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalysisReadyWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalysisReadyWebAPI.java @@ -2,12 +2,12 @@ * 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.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.systems.webserver.webapi.bukkit; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java index 8abe493b12..da92785a83 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java @@ -2,12 +2,12 @@ * 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.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.systems.webserver.webapi.bukkit; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java index 82d374b257..41fad84034 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java @@ -2,19 +2,19 @@ * 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.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.systems.webserver.webapi.bukkit; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.settings.ServerSpecificSettings; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; 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.PlanBungee; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.settings.ServerSpecificSettings; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.HashMap; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java index cc9c80d1b6..d25d65e35a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java @@ -2,12 +2,12 @@ * 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.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.systems.webserver.webapi.bukkit; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/IsOnlineWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/IsOnlineWebAPI.java index 0c58e5b549..e4badd9cb7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/IsOnlineWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/IsOnlineWebAPI.java @@ -2,13 +2,13 @@ * 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.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.systems.webserver.webapi.bukkit; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import org.bukkit.entity.Player; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java index dc3350772d..716760529f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java @@ -2,14 +2,14 @@ * 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.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.systems.webserver.webapi.bukkit; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.info.BukkitInformationManager; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/IsCachedWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/IsCachedWebAPI.java index 7b2aad2c5e..de5ed9e3d5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/IsCachedWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/IsCachedWebAPI.java @@ -2,14 +2,14 @@ * 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.systems.webserver.webapi.bungee; +package com.djrapitops.plan.systems.webserver.webapi.bungee; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.api.exceptions.WebAPINotFoundException; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.api.exceptions.WebAPINotFoundException; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java index 7c131d498d..18a8569f41 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java @@ -2,20 +2,20 @@ * 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.systems.webserver.webapi.bungee; +package com.djrapitops.plan.systems.webserver.webapi.bungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; +import com.djrapitops.plan.systems.webserver.response.AnalysisPageResponse; +import com.djrapitops.plan.systems.webserver.response.InspectPageResponse; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.utilities.file.export.HtmlExport; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; -import main.java.com.djrapitops.plan.systems.webserver.response.AnalysisPageResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.InspectPageResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import main.java.com.djrapitops.plan.utilities.file.export.HtmlExport; import org.apache.commons.lang3.text.StrSubstitutor; import java.util.HashMap; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java index 3cf3062b99..efb6f3ef2c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java @@ -2,13 +2,13 @@ * 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.systems.webserver.webapi.bungee; +package com.djrapitops.plan.systems.webserver.webapi.bungee; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.info.BungeeInformationManager; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.info.BungeeInformationManager; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java index f72ce8f984..835bf735e8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java @@ -2,15 +2,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.systems.webserver.webapi.bungee; +package com.djrapitops.plan.systems.webserver.webapi.bungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.info.BungeeInformationManager; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.info.BungeeInformationManager; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java index 0f570a6050..764dd1bbfa 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java @@ -2,17 +2,17 @@ * 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.systems.webserver.webapi.bungee; +package com.djrapitops.plan.systems.webserver.webapi.bungee; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.PlanBungee; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.HashMap; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java index 059bb33dac..dd6adaf368 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java @@ -2,18 +2,18 @@ * 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.systems.webserver.webapi.bungee; +package com.djrapitops.plan.systems.webserver.webapi.bungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.info.server.ServerInfo; +import com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; -import main.java.com.djrapitops.plan.systems.processing.Processor; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; import java.sql.SQLException; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestSetupWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestSetupWebAPI.java index 59f0a3fd62..6e05413bad 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestSetupWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestSetupWebAPI.java @@ -2,20 +2,20 @@ * 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.systems.webserver.webapi.bungee; +package com.djrapitops.plan.systems.webserver.webapi.bungee; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.info.server.ServerInfo; +import com.djrapitops.plan.systems.webserver.response.ForbiddenResponse; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; 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.PlanBungee; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; -import main.java.com.djrapitops.plan.systems.webserver.response.ForbiddenResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java index 22b12a31ba..9717887dd9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java @@ -2,19 +2,19 @@ * 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.systems.webserver.webapi.universal; +package com.djrapitops.plan.systems.webserver.webapi.universal; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.systems.info.BukkitInformationManager; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; -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.api.exceptions.WebAPIException; -import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.io.IOException; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/Condition.java b/Plan/src/main/java/com/djrapitops/plan/utilities/Condition.java index 1e9119d2e5..cef9437440 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/Condition.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/Condition.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.ISender; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java index 946c448448..a53f38463b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java @@ -1,7 +1,7 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; +import com.djrapitops.plan.settings.Settings; import com.djrapitops.plugin.utilities.Format; -import main.java.com.djrapitops.plan.settings.Settings; import org.apache.commons.lang3.StringUtils; import org.bukkit.Location; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java index 81613de5a9..6877ce5313 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java @@ -1,12 +1,12 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.database.databases.SQLiteDB; +import com.djrapitops.plan.database.tables.move.BatchOperationTable; +import com.djrapitops.plan.systems.file.database.DBSystem; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.database.databases.SQLiteDB; -import main.java.com.djrapitops.plan.database.tables.move.BatchOperationTable; -import main.java.com.djrapitops.plan.systems.file.database.DBSystem; import java.sql.SQLException; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java index 5dd9c5c827..d96406674e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java @@ -1,18 +1,18 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.PlanBungee; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.command.CommandUtils; import com.djrapitops.plugin.command.ISender; -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.database.Database; -import main.java.com.djrapitops.plan.settings.Permissions; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.settings.locale.Locale; -import main.java.com.djrapitops.plan.settings.locale.Msg; import java.io.Closeable; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/PassEncryptUtil.java b/Plan/src/main/java/com/djrapitops/plan/utilities/PassEncryptUtil.java index cbb1a4db24..1bab179858 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/PassEncryptUtil.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/PassEncryptUtil.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; 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 5e5d4a029c..fcc1b951b7 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 @@ -1,29 +1,29 @@ -package main.java.com.djrapitops.plan.utilities.analysis; - +package com.djrapitops.plan.utilities.analysis; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.AnalysisData; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.plugin.BanData; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.cache.SessionCache; +import com.djrapitops.plan.systems.info.BukkitInformationManager; +import com.djrapitops.plan.systems.info.InformationManager; +import com.djrapitops.plan.systems.tasks.PlanTaskSystem; +import com.djrapitops.plan.systems.tasks.TaskSystem; +import com.djrapitops.plan.systems.webserver.response.ErrorResponse; +import com.djrapitops.plan.systems.webserver.response.InternalErrorResponse; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; import com.djrapitops.plugin.task.RunnableFactory; -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.element.AnalysisContainer; -import main.java.com.djrapitops.plan.data.plugin.BanData; -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; -import main.java.com.djrapitops.plan.settings.locale.Msg; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.cache.SessionCache; -import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; -import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.tasks.PlanTaskSystem; -import main.java.com.djrapitops.plan.systems.tasks.TaskSystem; -import main.java.com.djrapitops.plan.systems.webserver.response.ErrorResponse; -import main.java.com.djrapitops.plan.systems.webserver.response.InternalErrorResponse; import java.util.*; import java.util.stream.Collectors; 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 c4776ad8c7..e6a36458d1 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 @@ -1,15 +1,15 @@ -package main.java.com.djrapitops.plan.utilities.analysis; - +package com.djrapitops.plan.utilities.analysis; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.StickyData; +import com.djrapitops.plan.data.time.GMTimes; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; 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.PlayerProfile; -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.time.GMTimes; -import main.java.com.djrapitops.plan.data.time.WorldTimes; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.SQLException; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/DouglasPeuckerAlgorithm.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/DouglasPeuckerAlgorithm.java index 26622a89ac..c6b550cdde 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/DouglasPeuckerAlgorithm.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/DouglasPeuckerAlgorithm.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.analysis; +package com.djrapitops.plan.utilities.analysis; import java.util.ArrayList; import java.util.Arrays; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Line.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Line.java index 03212d13e3..f857d32d7d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Line.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Line.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.analysis; +package com.djrapitops.plan.utilities.analysis; /** * @author ristolah diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/MathUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/MathUtils.java index ceaca156ac..f1969c1964 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/MathUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/MathUtils.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.analysis; +package com.djrapitops.plan.utilities.analysis; import java.io.Serializable; import java.text.DecimalFormat; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Point.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Point.java index 3199d1230e..cf74bf1fe2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Point.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Point.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.analysis; +package com.djrapitops.plan.utilities.analysis; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ReduceGapTriangles.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ReduceGapTriangles.java index fc267e59b8..3de42f283a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ReduceGapTriangles.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ReduceGapTriangles.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.utilities.analysis; +package com.djrapitops.plan.utilities.analysis; +import com.djrapitops.plan.utilities.comparators.PointComparator; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.utilities.comparators.PointComparator; import java.util.HashSet; import java.util.List; 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 c14febf6f1..08ea1e9eb1 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; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.Action; +import 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 4cd19547de..ce1986b91e 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; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.data.container.GeoInfo; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/HasDateComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/HasDateComparator.java index 2242127bce..b7afe27c5b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/HasDateComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/HasDateComparator.java @@ -2,9 +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.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.HasDate; +import com.djrapitops.plan.data.HasDate; 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 881b5892b8..6ed0c31018 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; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.data.container.PlayerKill; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/LocaleEntryComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/LocaleEntryComparator.java index 9b9b876508..c9614867c0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/LocaleEntryComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/LocaleEntryComparator.java @@ -1,7 +1,7 @@ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.settings.locale.Message; -import main.java.com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.settings.locale.Message; +import com.djrapitops.plan.settings.locale.Msg; import java.util.Comparator; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java index 4cc1ebfc93..129de42f27 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; import java.util.ArrayList; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PieSliceComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PieSliceComparator.java index 6a8bac4ebe..1be438a05d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PieSliceComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PieSliceComparator.java @@ -2,9 +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.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.PieSlice; +import com.djrapitops.plan.utilities.html.graphs.pie.PieSlice; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileLastPlayedComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileLastPlayedComparator.java index c8dd7f78a1..6b47ef27e4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileLastPlayedComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileLastPlayedComparator.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.PlayerProfile; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileNameComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileNameComparator.java index da7a5c416d..19cae5512d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileNameComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PlayerProfileNameComparator.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.PlayerProfile; 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 08e908d838..519640e9a7 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 @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.plugin.PluginData; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PointComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PointComparator.java index 0e6e7fb58f..b26a12adce 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PointComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/PointComparator.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.utilities.analysis.Point; +import com.djrapitops.plan.utilities.analysis.Point; 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 d9c2fddff2..d1c90df18d 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; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.Session; +import 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 47a878cff1..f783df30bb 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; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.Session; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/StringLengthComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/StringLengthComparator.java index 0fa093bd26..f4e91b9c3e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/StringLengthComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/StringLengthComparator.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; 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 1175901885..5e2d20d188 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; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.TPS; +import 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 8d62c2234d..c6717e793b 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 @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.UserInfo; +import 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 c22200ec91..1566acd09e 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 @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.data.container.UserInfo; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/WebUserComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/WebUserComparator.java index e1bd3281d2..be5ce46688 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/WebUserComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/WebUserComparator.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.utilities.comparators; +package com.djrapitops.plan.utilities.comparators; -import main.java.com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.data.WebUser; import java.util.Comparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java index 5fd9627a6d..f45d67eeb3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java @@ -1,9 +1,9 @@ -package main.java.com.djrapitops.plan.utilities.file; +package com.djrapitops.plan.utilities.file; +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.io.File; import java.io.FileNotFoundException; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.java index ade092eedb..896efa2cd3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/AnalysisExport.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.utilities.file.export; +package com.djrapitops.plan.utilities.file.export; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/Hastebin.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/Hastebin.java index 2eabc3869d..ea18d957c8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/Hastebin.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/Hastebin.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.file.export; +package com.djrapitops.plan.utilities.file.export; import com.djrapitops.plugin.api.utility.log.Log; import com.google.common.base.Splitter; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java index e809bccb86..5d171327e6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java @@ -2,17 +2,17 @@ * 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.utilities.file.export; - +package com.djrapitops.plan.utilities.file.export; + +import com.djrapitops.plan.api.IPlan; +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.systems.webserver.response.PlayersPageResponse; +import com.djrapitops.plan.systems.webserver.webapi.bungee.PostHtmlWebAPI; +import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.RunnableFactory; -import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.data.container.UserInfo; -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.webserver.response.PlayersPageResponse; -import main.java.com.djrapitops.plan.systems.webserver.webapi.bungee.PostHtmlWebAPI; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; import java.io.File; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.java index 16d7d10272..3d9a50fcc4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/PlayerExport.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.utilities.file.export; +package com.djrapitops.plan.utilities.file.export; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java index 2236072775..212f94786e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java @@ -2,16 +2,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.utilities.file.export; +package com.djrapitops.plan.utilities.file.export; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageId; +import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageId; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.io.File; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java index a2b0a35be2..fe6a681831 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.html; +package com.djrapitops.plan.utilities.html; import org.apache.commons.lang3.text.StrSubstitutor; 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 8cc2f622c3..ca66fc41f0 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 @@ -2,20 +2,20 @@ * 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.utilities.html; - +package com.djrapitops.plan.utilities.html; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.ServerVariableHolder; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.systems.info.BukkitInformationManager; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraph; +import com.djrapitops.plan.utilities.html.structure.SessionTabStructureCreator; +import com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; 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.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; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraph; -import main.java.com.djrapitops.plan.utilities.html.structure.SessionTabStructureCreator; -import main.java.com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; import java.sql.SQLException; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java index 920d2d909a..1f21d0e252 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.utilities.html; +package com.djrapitops.plan.utilities.html; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.MiscUtils; import org.apache.commons.lang3.text.StrSubstitutor; import java.io.Serializable; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraph.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraph.java index e80462165a..d1d8f7d533 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraph.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraph.java @@ -2,12 +2,12 @@ * 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.utilities.html.graphs; +package com.djrapitops.plan.utilities.html.graphs; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; -import main.java.com.djrapitops.plan.settings.theme.Theme; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.ActivityPie; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.graphs.pie.ActivityPie; import java.util.Map; import java.util.Set; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraph.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraph.java index dc355f2a54..6e4db9c7af 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraph.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraph.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.html.graphs; +package com.djrapitops.plan.utilities.html.graphs; -import main.java.com.djrapitops.plan.data.container.Session; -import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; import java.util.Collection; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMap.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMap.java index 59862d780a..a148494096 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMap.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMap.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs; +package com.djrapitops.plan.utilities.html.graphs; import java.util.HashMap; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraph.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraph.java index aa7a8322e7..49a9d40c6a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraph.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraph.java @@ -1,7 +1,7 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs.line; +package com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.container.TPS; -import main.java.com.djrapitops.plan.utilities.analysis.Point; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.utilities.analysis.Point; import java.util.List; import java.util.stream.Collectors; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/LineSeries.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/LineSeries.java index 4dddc9ae6e..932a3938b0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/LineSeries.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/LineSeries.java @@ -3,11 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.html.graphs.line; +package com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.utilities.analysis.DouglasPeuckerAlgorithm; -import main.java.com.djrapitops.plan.utilities.analysis.Point; -import main.java.com.djrapitops.plan.utilities.analysis.ReduceGapTriangles; +import com.djrapitops.plan.utilities.analysis.Point; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraph.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraph.java index 77f1833d77..0398fde9d0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraph.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraph.java @@ -1,7 +1,7 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs.line; +package com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.container.TPS; -import main.java.com.djrapitops.plan.utilities.analysis.Point; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.utilities.analysis.Point; import java.util.List; import java.util.stream.Collectors; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraph.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraph.java index 23f87a873f..71340d85e4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraph.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraph.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs.line; +package com.djrapitops.plan.utilities.html.graphs.line; -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; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.systems.tasks.TPSCountTimer; +import com.djrapitops.plan.utilities.analysis.Point; import java.util.List; import java.util.stream.Collectors; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePie.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePie.java index bab0b61ada..0d985a9445 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePie.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePie.java @@ -1,6 +1,6 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs.line; +package com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.data.time.WorldTimes; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraph.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraph.java index 98094f60fe..7bf6c63ae8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraph.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraph.java @@ -1,10 +1,9 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs.line; +package com.djrapitops.plan.utilities.html.graphs.line; -import main.java.com.djrapitops.plan.data.container.TPS; -import main.java.com.djrapitops.plan.utilities.analysis.Point; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.utilities.analysis.Point; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraph.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraph.java index 458f8e7ead..0964743801 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraph.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraph.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs.line; +package com.djrapitops.plan.utilities.html.graphs.line; -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; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.systems.tasks.TPSCountTimer; +import com.djrapitops.plan.utilities.analysis.Point; import java.util.List; import java.util.stream.Collectors; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPie.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPie.java index 6ebef2a2fc..1ab72b2f7e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPie.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPie.java @@ -2,10 +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.utilities.html.graphs.pie; +package com.djrapitops.plan.utilities.html.graphs.pie; -import main.java.com.djrapitops.plan.settings.theme.ThemeVal; -import main.java.com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; import java.util.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeries.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeries.java index 3b7405e6a0..bc71845a32 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeries.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeries.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.utilities.html.graphs.pie; +package com.djrapitops.plan.utilities.html.graphs.pie; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSlice.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSlice.java index ad358cc69b..01c5628eae 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSlice.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSlice.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.utilities.html.graphs.pie; +package com.djrapitops.plan.utilities.html.graphs.pie; /** * Represents a slice of a pie. diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPie.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPie.java index 77a02a53cb..d15ff8076f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPie.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPie.java @@ -1,12 +1,12 @@ -package main.java.com.djrapitops.plan.utilities.html.graphs.pie; - -import main.java.com.djrapitops.plan.data.time.GMTimes; -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; -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.comparators.PieSliceComparator; +package com.djrapitops.plan.utilities.html.graphs.pie; + +import com.djrapitops.plan.data.time.GMTimes; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.WorldAliasSettings; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.utilities.comparators.PieSliceComparator; import java.util.*; import java.util.stream.Collectors; 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 8c07572c25..afc536bbde 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 @@ -2,14 +2,14 @@ * 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.utilities.html.structure; - -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; +package com.djrapitops.plan.utilities.html.structure; + +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.analysis.Analysis; +import com.djrapitops.plan.utilities.comparators.PluginDataNameComparator; +import com.djrapitops.plan.utilities.html.tables.PlayersTableCreator; import java.util.ArrayList; import java.util.List; 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 9c62aac8e3..68f4cc4f5d 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 @@ -2,13 +2,13 @@ * 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.utilities.html.structure; +package com.djrapitops.plan.utilities.html.structure; -import main.java.com.djrapitops.plan.Plan; -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; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.systems.info.server.BukkitServerInfoManager; +import com.djrapitops.plan.utilities.comparators.PluginDataNameComparator; import java.util.ArrayList; import java.util.List; 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 2bff72903d..df1ec82cfd 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 @@ -2,18 +2,18 @@ * 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.utilities.html.structure; - +package com.djrapitops.plan.utilities.html.structure; + +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import com.djrapitops.plugin.utilities.Format; -import main.java.com.djrapitops.plan.data.PlayerProfile; -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.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; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import java.util.List; import java.util.Map; 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 6eaf0d9c7a..59f6928bcf 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 @@ -2,22 +2,22 @@ * 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.utilities.html.structure; - +package com.djrapitops.plan.utilities.html.structure; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.settings.theme.ThemeVal; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.analysis.AnalysisUtils; +import com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; +import com.djrapitops.plan.utilities.html.tables.KillsTableCreator; +import com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; import com.djrapitops.plugin.utilities.Verify; -import main.java.com.djrapitops.plan.Plan; -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.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; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; -import main.java.com.djrapitops.plan.utilities.html.tables.KillsTableCreator; -import main.java.com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; import java.util.HashMap; import java.util.List; 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 d2ae56d364..9a1c29d8a2 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 @@ -2,12 +2,12 @@ * 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.utilities.html.tables; +package com.djrapitops.plan.utilities.html.tables; -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; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; +import com.djrapitops.plan.data.container.Action; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.HtmlUtils; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/CommandUseTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/CommandUseTableCreator.java index d7091f86cb..344dd382c7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/CommandUseTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/CommandUseTableCreator.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.utilities.html.tables; +package com.djrapitops.plan.utilities.html.tables; +import com.djrapitops.plan.utilities.comparators.MapComparator; +import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.utilities.comparators.MapComparator; -import main.java.com.djrapitops.plan.utilities.html.Html; import java.util.Collections; import java.util.List; 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 b145a23ebb..e3e44b882c 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 @@ -2,12 +2,12 @@ * 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.utilities.html.tables; +package com.djrapitops.plan.utilities.html.tables; -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; +import com.djrapitops.plan.data.container.GeoInfo; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.comparators.GeoInfoComparator; +import com.djrapitops.plan.utilities.html.Html; import java.util.List; 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 3d7d00cbb2..cf14b6e3c3 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,12 +1,12 @@ -package main.java.com.djrapitops.plan.utilities.html.tables; - -import main.java.com.djrapitops.plan.Plan; -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; -import main.java.com.djrapitops.plan.utilities.comparators.KillDataComparator; -import main.java.com.djrapitops.plan.utilities.html.Html; +package com.djrapitops.plan.utilities.html.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.comparators.KillDataComparator; +import com.djrapitops.plan.utilities.html.Html; import java.util.Collections; import java.util.List; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTableCreator.java index fd5c9fb0fc..f67591905b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTableCreator.java @@ -2,10 +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.utilities.html.tables; +package com.djrapitops.plan.utilities.html.tables; -import main.java.com.djrapitops.plan.utilities.html.Html; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; +import com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.HtmlUtils; import java.util.List; import java.util.Map; 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 af96255b38..50e267a45e 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 @@ -1,15 +1,15 @@ -package main.java.com.djrapitops.plan.utilities.html.tables; - +package com.djrapitops.plan.utilities.html.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.html.Html; 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.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; -import main.java.com.djrapitops.plan.utilities.html.Html; import org.apache.commons.lang3.ArrayUtils; import java.io.Serializable; 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 368a8a42b1..08362a0c82 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 @@ -2,19 +2,19 @@ * 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.utilities.html.tables; - -import main.java.com.djrapitops.plan.Plan; -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; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.cache.SessionCache; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.comparators.SessionStartComparator; -import main.java.com.djrapitops.plan.utilities.html.Html; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; +package com.djrapitops.plan.utilities.html.tables; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.WorldAliasSettings; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.cache.SessionCache; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.comparators.SessionStartComparator; +import com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import java.util.*; import java.util.stream.Collectors; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStats.java b/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStats.java index d43dbe1e79..b278f043e6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStats.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStats.java @@ -1,10 +1,10 @@ -package main.java.com.djrapitops.plan.utilities.metrics; +package com.djrapitops.plan.utilities.metrics; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.settings.Settings; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.settings.Settings; import java.util.HashMap; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/Metrics.java b/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/Metrics.java index 70413296ef..e026a02f3f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/Metrics.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/Metrics.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities.metrics; +package com.djrapitops.plan.utilities.metrics; import com.djrapitops.plugin.api.TimeAmount; import org.bukkit.Bukkit; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/uuid/UUIDUtility.java b/Plan/src/main/java/com/djrapitops/plan/utilities/uuid/UUIDUtility.java index 11a1adb076..d33fde4253 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/uuid/UUIDUtility.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/uuid/UUIDUtility.java @@ -3,14 +3,14 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.uuid; +package com.djrapitops.plan.utilities.uuid; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.UUIDFetcher; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.sql.SQLException; import java.util.UUID; diff --git a/Plan/src/main/resources/bungee.yml b/Plan/src/main/resources/bungee.yml index d186ec005f..6830790892 100644 --- a/Plan/src/main/resources/bungee.yml +++ b/Plan/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: Plan author: Rsl1122 -main: main.java.com.djrapitops.plan.PlanBungee +main: com.djrapitops.plan.PlanBungee version: 4.1.4 \ No newline at end of file diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml index 920a2676a7..dc978003e1 100644 --- a/Plan/src/main/resources/plugin.yml +++ b/Plan/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Plan author: Rsl1122 -main: main.java.com.djrapitops.plan.Plan +main: com.djrapitops.plan.Plan version: 4.1.4 softdepend: - EssentialsX diff --git a/Plan/test/main/java/com/djrapitops/plan/PermissionsTest.java b/Plan/test/main/java/com/djrapitops/plan/PermissionsTest.java index 015b33eaf8..cc3bad2d10 100644 --- a/Plan/test/main/java/com/djrapitops/plan/PermissionsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/PermissionsTest.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan; +package com.djrapitops.plan; -import main.java.com.djrapitops.plan.settings.Permissions; +import com.djrapitops.plan.settings.Permissions; import org.junit.Test; -import test.java.utils.TestUtils; +import test.utilities.TestUtils; import static org.junit.Assert.assertEquals; diff --git a/Plan/test/main/java/com/djrapitops/plan/ServerVariableHolderTest.java b/Plan/test/main/java/com/djrapitops/plan/ServerVariableHolderTest.java index d35774bf31..008cc37746 100644 --- a/Plan/test/main/java/com/djrapitops/plan/ServerVariableHolderTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/ServerVariableHolderTest.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan; +package com.djrapitops.plan; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; @@ -6,7 +6,7 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.TestInit; +import test.utilities.TestInit; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertFalse; diff --git a/Plan/test/main/java/com/djrapitops/plan/SettingsTest.java b/Plan/test/main/java/com/djrapitops/plan/SettingsTest.java index b43ea8a82f..e8e9246002 100644 --- a/Plan/test/main/java/com/djrapitops/plan/SettingsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/SettingsTest.java @@ -3,16 +3,16 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan; +package com.djrapitops.plan; -import main.java.com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.Settings; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.TestInit; +import test.utilities.TestInit; import java.util.Collections; import java.util.List; 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 1c4a06cf99..8817468303 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/PlayerKillTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/PlayerKillTest.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.data; +package com.djrapitops.plan.data; -import main.java.com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.data.container.PlayerKill; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.util.UUID; 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 d1127c33da..9ebcd87f7f 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/PlayerProfileTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/PlayerProfileTest.java @@ -1,16 +1,16 @@ -package main.java.com.djrapitops.plan.data; +package com.djrapitops.plan.data; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.MiscUtils; 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; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.TestInit; +import test.utilities.TestInit; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ public void setUp() throws Exception { } @Test - public void testMaxActivityIndex() throws Exception { + public void testMaxActivityIndex() { PlayerProfile p = new PlayerProfile(null, null, 0L); List sessions = new ArrayList<>(); @@ -57,7 +57,7 @@ public void testMaxActivityIndex() throws Exception { } @Test - public void testMaxActivityIndex2() throws Exception { + public void testMaxActivityIndex2() { PlayerProfile p = new PlayerProfile(null, null, 0L); List sessions = new ArrayList<>(); @@ -81,7 +81,7 @@ public void testMaxActivityIndex2() throws Exception { } @Test - public void testActivityIndexOne() throws Exception { + public void testActivityIndexOne() { PlayerProfile p = new PlayerProfile(null, null, 0L); List sessions = new ArrayList<>(); @@ -105,7 +105,7 @@ public void testActivityIndexOne() throws Exception { } @Test(timeout = 500) - public void testMethodTimeout() throws Exception { + public void testMethodTimeout() { PlayerProfile p = new PlayerProfile(null, null, 0L); List sessions = new ArrayList<>(); long date = 0; 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 75bd0205ef..554a5f9883 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/SessionTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/SessionTest.java @@ -3,9 +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 com.djrapitops.plan.data; -import main.java.com.djrapitops.plan.data.container.Session; +import 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 4d60ff1254..ab526a3f41 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/UserInfoTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/UserInfoTest.java @@ -1,7 +1,7 @@ -package main.java.com.djrapitops.plan.data; +package com.djrapitops.plan.data; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.container.UserInfo; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Ignore; @@ -9,7 +9,7 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.TestInit; +import test.utilities.TestInit; /** * @author Rsl1122 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 8035f9af17..42e728f0bd 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 @@ -2,16 +2,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.data.additional.importer; +package com.djrapitops.plan.data.additional.importer; +import com.djrapitops.plan.data.container.PlayerKill; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.data.time.GMTimes; +import com.djrapitops.plan.systems.processing.importing.ServerImportData; +import com.djrapitops.plan.systems.processing.importing.UserImportData; import com.google.common.collect.ImmutableMap; -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; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.util.Arrays; import java.util.Collections; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/cache/DataCacheTest.java b/Plan/test/main/java/com/djrapitops/plan/data/cache/DataCacheTest.java index 69952f927a..a093737f50 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/cache/DataCacheTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/cache/DataCacheTest.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.data.cache; +package com.djrapitops.plan.data.cache; -import main.java.com.djrapitops.plan.database.Database; -import main.java.com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.database.Database; +import com.djrapitops.plan.systems.cache.DataCache; import org.bukkit.plugin.java.JavaPlugin; import org.junit.After; import org.junit.Before; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/cache/GeolocationCacheTest.java b/Plan/test/main/java/com/djrapitops/plan/data/cache/GeolocationCacheTest.java index b13d748d64..0f1a3dc6dd 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/cache/GeolocationCacheTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/cache/GeolocationCacheTest.java @@ -1,13 +1,13 @@ -package main.java.com.djrapitops.plan.data.cache; +package com.djrapitops.plan.data.cache; -import main.java.com.djrapitops.plan.systems.cache.GeolocationCache; +import com.djrapitops.plan.systems.cache.GeolocationCache; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.TestInit; +import test.utilities.TestInit; import java.util.HashMap; import java.util.Map; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java b/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java index 755d424bd4..1efd781d8b 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java @@ -1,10 +1,10 @@ -package main.java.com.djrapitops.plan.data.cache; +package com.djrapitops.plan.data.cache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.pagecache.PageLoader; -import main.java.com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.systems.webserver.pagecache.PageCache; +import com.djrapitops.plan.systems.webserver.pagecache.PageLoader; +import com.djrapitops.plan.systems.webserver.response.Response; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import static junit.framework.TestCase.*; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/cache/SessionCacheTest.java b/Plan/test/main/java/com/djrapitops/plan/data/cache/SessionCacheTest.java index 32567098fd..5a2372f94b 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/cache/SessionCacheTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/cache/SessionCacheTest.java @@ -3,16 +3,16 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.data.cache; +package com.djrapitops.plan.data.cache; -import main.java.com.djrapitops.plan.systems.cache.SessionCache; +import com.djrapitops.plan.systems.cache.SessionCache; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.TestInit; +import test.utilities.TestInit; /** * @author Rsl1122 diff --git a/Plan/test/main/java/com/djrapitops/plan/data/time/GMTimesTest.java b/Plan/test/main/java/com/djrapitops/plan/data/time/GMTimesTest.java index 18dc002fdf..4879c616f0 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/time/GMTimesTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/time/GMTimesTest.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.data.time; +package com.djrapitops.plan.data.time; import org.junit.Test; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/time/WorldTimesTest.java b/Plan/test/main/java/com/djrapitops/plan/data/time/WorldTimesTest.java index aea8e910ba..b193bf6e8c 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/time/WorldTimesTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/time/WorldTimesTest.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.data.time; +package com.djrapitops.plan.data.time; import com.google.common.collect.ImmutableMap; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.util.ArrayList; import java.util.List; diff --git a/Plan/test/main/java/com/djrapitops/plan/database/DBUtilsTest.java b/Plan/test/main/java/com/djrapitops/plan/database/DBUtilsTest.java index 9fe3c86451..1969dfe88d 100644 --- a/Plan/test/main/java/com/djrapitops/plan/database/DBUtilsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/database/DBUtilsTest.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.database; +package com.djrapitops.plan.database; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.util.ArrayList; import java.util.HashMap; 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 2d6792490a..e98c3dd16b 100644 --- a/Plan/test/main/java/com/djrapitops/plan/database/DatabaseTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/database/DatabaseTest.java @@ -3,25 +3,25 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -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.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; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.database.databases.SQLiteDB; -import main.java.com.djrapitops.plan.database.tables.*; -import main.java.com.djrapitops.plan.systems.cache.DataCache; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; -import main.java.com.djrapitops.plan.systems.processing.player.RegisterProcessor; -import main.java.com.djrapitops.plan.utilities.ManageUtils; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; -import main.java.com.djrapitops.plan.utilities.file.FileUtil; +package com.djrapitops.plan.database; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DatabaseInitException; +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.data.container.*; +import com.djrapitops.plan.data.time.GMTimes; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.database.databases.MySQLDB; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.databases.SQLiteDB; +import com.djrapitops.plan.database.tables.*; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.info.server.ServerInfo; +import com.djrapitops.plan.systems.processing.player.RegisterProcessor; +import com.djrapitops.plan.utilities.ManageUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.utilities.file.FileUtil; import org.bukkit.plugin.java.JavaPlugin; import org.junit.After; import org.junit.Before; @@ -31,9 +31,9 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.MockUtils; -import test.java.utils.RandomData; -import test.java.utils.TestInit; +import test.utilities.MockUtils; +import test.utilities.RandomData; +import test.utilities.TestInit; import java.io.File; import java.io.IOException; diff --git a/Plan/test/main/java/com/djrapitops/plan/database/tables/ActionsTest.java b/Plan/test/main/java/com/djrapitops/plan/database/tables/ActionsTest.java index fed2d1d6cb..27e28d8e63 100644 --- a/Plan/test/main/java/com/djrapitops/plan/database/tables/ActionsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/database/tables/ActionsTest.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.database.tables; +package com.djrapitops.plan.database.tables; import org.junit.Test; 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 104c498f26..9b8d890b36 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; +package com.djrapitops.plan.systems.cache; -import main.java.com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.Session; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Ignore; @@ -8,8 +8,8 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.MockUtils; -import test.java.utils.TestInit; +import test.utilities.MockUtils; +import test.utilities.TestInit; import java.util.Optional; import java.util.UUID; diff --git a/Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebServerTest.java b/Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebServerTest.java index 078de88205..08b657f65b 100644 --- a/Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebServerTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebServerTest.java @@ -1,15 +1,15 @@ -package main.java.com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.systems.webserver; +import com.djrapitops.plan.Plan; import com.sun.net.httpserver.HttpExchange; -import main.java.com.djrapitops.plan.Plan; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.MockUtils; -import test.java.utils.TestInit; +import test.utilities.MockUtils; +import test.utilities.TestInit; import java.io.IOException; import java.util.HashMap; diff --git a/Plan/test/main/java/com/djrapitops/plan/ui/HtmlTest.java b/Plan/test/main/java/com/djrapitops/plan/ui/HtmlTest.java index 4c37402b75..ef5af70608 100644 --- a/Plan/test/main/java/com/djrapitops/plan/ui/HtmlTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/ui/HtmlTest.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.ui; +package com.djrapitops.plan.ui; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.utilities.html.Html; import org.junit.Test; import static org.junit.Assert.assertEquals; 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 476c8632fc..05695ef927 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 @@ -2,14 +2,14 @@ * 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.ui.graphs; - -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.PunchCardGraph; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.*; +package com.djrapitops.plan.ui.graphs; + +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.utilities.analysis.Point; +import com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; +import com.djrapitops.plan.utilities.html.graphs.line.*; import org.apache.commons.lang3.StringUtils; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Assert; @@ -18,8 +18,8 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.RandomData; -import test.java.utils.TestInit; +import test.utilities.RandomData; +import test.utilities.TestInit; import java.util.*; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/ConditionTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/ConditionTest.java index f52c381cc5..8ae9aba3de 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/ConditionTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/ConditionTest.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.bukkit.BukkitCMDSender; @@ -8,9 +8,9 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.MockUtils; -import test.java.utils.RandomData; -import test.java.utils.TestInit; +import test.utilities.MockUtils; +import test.utilities.RandomData; +import test.utilities.TestInit; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java index d6f33200eb..41f89486bb 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java @@ -1,4 +1,4 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; import com.djrapitops.plugin.api.TimeAmount; import org.bukkit.Location; @@ -9,9 +9,9 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.MockUtils; -import test.java.utils.RandomData; -import test.java.utils.TestInit; +import test.utilities.MockUtils; +import test.utilities.RandomData; +import test.utilities.TestInit; import java.text.SimpleDateFormat; import java.util.Date; @@ -181,7 +181,7 @@ public void testFormatLocation() { } @Test - public void testCutDecimalsWhichIsRoundedDown() throws Exception { + public void testCutDecimalsWhichIsRoundedDown() { double d = 0.05234; String expResult = "0,05"; @@ -191,7 +191,7 @@ public void testCutDecimalsWhichIsRoundedDown() throws Exception { } @Test - public void testCutDecimalsWhichIsRoundedUp() throws Exception { + public void testCutDecimalsWhichIsRoundedUp() { double d = 0.05634; String expResult = "0,06"; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/HtmlUtilsTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/HtmlUtilsTest.java index a211eb9073..9a88ba575d 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/HtmlUtilsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/HtmlUtilsTest.java @@ -3,16 +3,16 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; +import com.djrapitops.plan.utilities.html.HtmlUtils; import com.google.common.collect.ImmutableMap; -import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.io.Serializable; import java.util.Map; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/MiscUtilsTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/MiscUtilsTest.java index f133588062..391520aa5d 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/MiscUtilsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/MiscUtilsTest.java @@ -3,16 +3,16 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.databases.SQLiteDB; +import com.djrapitops.plan.database.tables.UsersTable; +import com.djrapitops.plan.systems.info.server.ServerInfo; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.bukkit.BukkitCMDSender; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.database.databases.SQLiteDB; -import main.java.com.djrapitops.plan.database.tables.UsersTable; -import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; @@ -20,9 +20,9 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.MockUtils; -import test.java.utils.RandomData; -import test.java.utils.TestInit; +import test.utilities.MockUtils; +import test.utilities.RandomData; +import test.utilities.TestInit; import java.util.List; import java.util.UUID; @@ -41,7 +41,7 @@ public class MiscUtilsTest { private SQLDB db; @Before - public void setUp() throws Exception { + public void setUp() { StaticHolder.saveInstance(MiscUtils.class, Plan.class); } diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/PassEncryptTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/PassEncryptTest.java index 7918a4f04f..8c50ae4e65 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/PassEncryptTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/PassEncryptTest.java @@ -1,8 +1,8 @@ -package main.java.com.djrapitops.plan.utilities; +package com.djrapitops.plan.utilities; import org.junit.Before; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.util.HashMap; import java.util.Map; 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 7fe3b85aac..e5eee8d5c6 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 @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.analysis; +package com.djrapitops.plan.utilities.analysis; import org.bukkit.plugin.java.JavaPlugin; import org.junit.Before; @@ -11,7 +11,7 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.TestInit; +import test.utilities.TestInit; import java.util.Arrays; import java.util.Collections; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java index f8c66161cf..90bccbf6b1 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package main.java.com.djrapitops.plan.utilities.analysis; +package com.djrapitops.plan.utilities.analysis; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.io.Serializable; import java.util.ArrayList; 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 4c7f984273..3808ab93a9 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,16 +1,16 @@ -package main.java.com.djrapitops.plan.utilities.comparators; - +package com.djrapitops.plan.utilities.comparators; + +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.settings.locale.Message; +import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.utilities.PassEncryptUtil; +import com.djrapitops.plan.utilities.analysis.Point; import com.google.common.collect.Ordering; -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; -import main.java.com.djrapitops.plan.utilities.analysis.Point; import org.junit.Test; -import test.java.utils.RandomData; +import test.utilities.RandomData; import java.util.*; import java.util.stream.Collectors; diff --git a/Plan/test/main/java/com/djrapitops/plan/utilities/export/HastebinTest.java b/Plan/test/main/java/com/djrapitops/plan/utilities/export/HastebinTest.java index 48cc17de0b..dbf3ae1656 100644 --- a/Plan/test/main/java/com/djrapitops/plan/utilities/export/HastebinTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/utilities/export/HastebinTest.java @@ -1,10 +1,10 @@ -package main.java.com.djrapitops.plan.utilities.export; +package com.djrapitops.plan.utilities.export; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.file.export.Hastebin; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.utility.log.Log; import com.google.common.collect.Iterables; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.file.export.Hastebin; import org.bukkit.plugin.java.JavaPlugin; import org.json.simple.parser.ParseException; import org.junit.Before; @@ -13,8 +13,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.java.utils.RandomData; -import test.java.utils.TestInit; +import test.utilities.RandomData; +import test.utilities.TestInit; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/Plan/test/main/java/test/utilities/DBTestSuite.java b/Plan/test/main/java/test/utilities/DBTestSuite.java new file mode 100644 index 0000000000..8a02fd3470 --- /dev/null +++ b/Plan/test/main/java/test/utilities/DBTestSuite.java @@ -0,0 +1,50 @@ +/* + * 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 test.utilities; + +import com.djrapitops.plan.database.DatabaseTest; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +import java.io.File; + +/** + * @author Fuzzlemann + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({DatabaseTest.class}) +public class DBTestSuite { + @BeforeClass + public static void setUp() { + clean(); + } + + @AfterClass + public static void tearDown() { + clean(); + } + + private static void clean() { + File testFolder = TestInit.getTestFolder(); + + if (!testFolder.exists() || !testFolder.isDirectory()) { + return; + } + + File[] files = testFolder.listFiles(); + + if (files == null) { + return; + } + + for (File f : files) { + if (!f.delete()) { + f.deleteOnExit(); + } + } + } +} diff --git a/Plan/test/main/java/test/utilities/MockUtils.java b/Plan/test/main/java/test/utilities/MockUtils.java new file mode 100644 index 0000000000..7e11296def --- /dev/null +++ b/Plan/test/main/java/test/utilities/MockUtils.java @@ -0,0 +1,216 @@ +package test.utilities; + +import com.sun.net.httpserver.*; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.mockito.Mockito; +import org.powermock.api.mockito.PowerMockito; + +import java.io.*; +import java.net.InetSocketAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.Charset; +import java.util.*; +import java.util.zip.GZIPInputStream; + +import static org.powermock.api.mockito.PowerMockito.when; + +/** + * @author Rsl1122 + */ +public class MockUtils { + + public static World mockWorld() { + World mockWorld = Mockito.mock(World.class); + when(mockWorld.toString()).thenReturn("World"); + return mockWorld; + } + + public static Player mockPlayer() { + Player p = PowerMockito.mock(Player.class); + when(p.getGameMode()).thenReturn(GameMode.SURVIVAL); + when(p.getUniqueId()).thenReturn(UUID.fromString("45b0dfdb-f71d-4cf3-8c21-27c9d4c651db")); + when(p.getFirstPlayed()).thenReturn(1234567L); + World mockWorld = mockWorld(); + when(p.getLocation()).thenReturn(new Location(mockWorld, 0, 0, 0)); + when(p.isOp()).thenReturn(true); + when(p.isBanned()).thenReturn(true); + when(p.isOnline()).thenReturn(true); + when(p.getName()).thenReturn("TestName"); + when(p.hasPermission("plan.inspect.other")).thenReturn(true); + return p; + } + + public static UUID getPlayerUUID() { + return UUID.fromString("45b0dfdb-f71d-4cf3-8c21-27c9d4c651db"); + } + + public static Player mockPlayer2() { + Player p = PowerMockito.mock(Player.class); + when(p.getGameMode()).thenReturn(GameMode.SPECTATOR); + when(p.getUniqueId()).thenReturn(UUID.fromString("ec94a954-1fa1-445b-b09b-9b698519af80")); + when(p.getFirstPlayed()).thenReturn(3423434L); + World mockWorld = mockWorld(); + when(p.getLocation()).thenReturn(new Location(mockWorld, 1, 0, 1)); + when(p.isOp()).thenReturn(false); + when(p.isBanned()).thenReturn(false); + when(p.isOnline()).thenReturn(false); + when(p.hasPermission("plan.inspect.other")).thenReturn(false); + when(p.getName()).thenReturn("TestName2"); + return p; + } + + public static UUID getPlayer2UUID() { + return UUID.fromString("ec94a954-1fa1-445b-b09b-9b698519af80"); + } + + public static Set getUUIDs() { + Set uuids = new HashSet<>(); + uuids.add(getPlayerUUID()); + uuids.add(getPlayer2UUID()); + return uuids; + } + + public static Player mockBrokenPlayer() { + Player p = PowerMockito.mock(Player.class); + when(p.getGameMode()).thenReturn(GameMode.SURVIVAL); + when(p.getUniqueId()).thenReturn(UUID.fromString("45b0dfdb-f71d-4cf3-8c21-27c9d4c651db")); + when(p.getFirstPlayed()).thenReturn(1234567L); + World mockWorld = mockWorld(); + when(p.getLocation()).thenReturn(new Location(mockWorld, 0, 0, 0)); + when(p.isOp()).thenReturn(true); + when(p.isBanned()).thenThrow(Exception.class); + when(p.isOnline()).thenReturn(true); + when(p.getName()).thenReturn("TestName"); + return p; + } + + public static CommandSender mockConsoleSender() { + return PowerMockito.mock(CommandSender.class); + } + + public static HttpServer mockHTTPServer() { + HttpServer httpServer = PowerMockito.mock(HttpServer.class); + when(httpServer.getAddress()).thenReturn(new InetSocketAddress(80)); + when(httpServer.getExecutor()).thenReturn(command -> System.out.println("HTTP Server command received")); + return httpServer; + } + + public static HttpExchange getHttpExchange(String requestMethod, String requestURI, String body, Map> responseHeaders) { + return new HttpExchange() { + private ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + + @Override + public Headers getRequestHeaders() { + Headers headers = new Headers(); + headers.put("Authorization", new ArrayList<>()); + return headers; + } + + @Override + public Headers getResponseHeaders() { + Headers headers = new Headers(); + headers.putAll(responseHeaders); + return headers; + } + + @Override + public URI getRequestURI() { + try { + return new URI(requestURI); + } catch (URISyntaxException e) { + return null; + } + } + + @Override + public String getRequestMethod() { + return requestMethod; + } + + @Override + public HttpContext getHttpContext() { + return null; + } + + @Override + public void close() { + + } + + @Override + public InputStream getRequestBody() { + return new ByteArrayInputStream(body.getBytes(Charset.forName("UTF-8"))); + } + + @Override + public OutputStream getResponseBody() { + return outputStream; + } + + @Override + public InetSocketAddress getRemoteAddress() { + return null; + } + + @Override + public InetSocketAddress getLocalAddress() { + return null; + } + + @Override + public String getProtocol() { + return null; + } + + @Override + public Object getAttribute(String name) { + return null; + } + + @Override + public void sendResponseHeaders(int i, long l) { + + } + + @Override + public int getResponseCode() { + return 0; + } + + @Override + public void setAttribute(String s, Object o) { + + } + + @Override + public void setStreams(InputStream inputStream, OutputStream outputStream) { + + } + + @Override + public HttpPrincipal getPrincipal() { + return null; + } + }; + } + + public static String getResponseStream(HttpExchange requestExchange) throws IOException { + InputStream in = new GZIPInputStream( + new ByteArrayInputStream(( + (ByteArrayOutputStream) requestExchange.getResponseBody() + ).toByteArray()) + ); + try (Scanner scanner = new Scanner(in)) { + StringBuilder s = new StringBuilder(); + while (scanner.hasNextLine()) { + s.append(scanner.nextLine()).append("\n"); + } + return s.toString(); + } + } +} diff --git a/Plan/test/main/java/test/utilities/RandomData.java b/Plan/test/main/java/test/utilities/RandomData.java new file mode 100644 index 0000000000..812ec3070c --- /dev/null +++ b/Plan/test/main/java/test/utilities/RandomData.java @@ -0,0 +1,77 @@ +package test.utilities; + +import com.djrapitops.plan.data.WebUser; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.data.container.TPS; +import com.djrapitops.plan.data.container.UserInfo; +import com.djrapitops.plan.utilities.PassEncryptUtil; +import com.djrapitops.plan.utilities.analysis.Point; +import org.apache.commons.lang3.RandomStringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; + +public class RandomData { + + private static final Random r = new Random(); + + public static int randomInt(int rangeStart, int rangeEnd) { + return ThreadLocalRandom.current().nextInt(rangeStart, rangeEnd); + } + + public static String randomString(int size) { + return RandomStringUtils.randomAlphanumeric(size); + } + + public static List randomWebUsers() throws PassEncryptUtil.CannotPerformOperationException { + List test = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + test.add(new WebUser(randomString(5), PassEncryptUtil.createHash(randomString(7)), r.nextInt())); + } + return test; + } + + public static List randomTPS() { + List test = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + int randInt = r.nextInt(); + long randLong = r.nextLong(); + test.add(new TPS(randLong, randLong, randInt, randLong, randLong, randInt, randInt)); + } + return test; + } + + public static List randomSessions() { + List test = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + test.add(new Session(1, r.nextLong(), r.nextLong(), 0, 0)); + } + return test; + } + + public static List randomPoints() { + List test = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + test.add(new Point(r.nextLong(), r.nextLong())); + } + return test; + } + + public static T randomEnum(Class clazz) { + int x = r.nextInt(clazz.getEnumConstants().length); + return clazz.getEnumConstants()[x]; + } + + public static List randomUserData() { + List test = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + UserInfo info = new UserInfo(UUID.randomUUID(), randomString(10), r.nextLong(), r.nextBoolean(), r.nextBoolean()); + info.setLastSeen(r.nextLong()); + test.add(info); + } + return test; + } +} diff --git a/Plan/test/main/java/test/utilities/TestInit.java b/Plan/test/main/java/test/utilities/TestInit.java new file mode 100644 index 0000000000..5b2be68ede --- /dev/null +++ b/Plan/test/main/java/test/utilities/TestInit.java @@ -0,0 +1,297 @@ +package test.utilities; + +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.ServerVariableHolder; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.settings.locale.Locale; +import com.djrapitops.plan.systems.cache.DataCache; +import com.djrapitops.plan.systems.info.server.BukkitServerInfoManager; +import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plugin.IPlugin; +import com.djrapitops.plugin.StaticHolder; +import com.djrapitops.plugin.api.config.Config; +import com.djrapitops.plugin.api.utility.log.Log; +import com.djrapitops.plugin.settings.ColorScheme; +import com.djrapitops.plugin.task.RunnableFactory; +import org.bukkit.ChatColor; +import org.bukkit.OfflinePlayer; +import org.bukkit.Server; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.conversations.Conversation; +import org.bukkit.conversations.ConversationAbandonedEvent; +import org.bukkit.permissions.Permission; +import org.bukkit.permissions.PermissionAttachment; +import org.bukkit.permissions.PermissionAttachmentInfo; +import org.bukkit.plugin.Plugin; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.modules.junit4.PowerMockRunner; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Set; +import java.util.UUID; +import java.util.logging.Logger; + +import static org.powermock.api.mockito.PowerMockito.when; + +/** + * @author Rsl1122 + */ +public class TestInit { + + private static final UUID serverUUID = UUID.fromString("9a27457b-f1a2-4b71-be7f-daf2170a1b66"); + private Plan planMock; + + /** + * Init locale with empty messages. + *

+ * Does not load any messages from anywhere because that would cause exceptions. + */ + public static void initEmptyLocale() { + new Locale(); + } + + /** + * Init locale with mocked Plan. + *

+ * requires getDataFolder mock. + * + * @param plan Mocked Plan + */ + public static void initLocale(Plan plan) { + new Locale().loadLocale(); + } + + public static TestInit init() throws Exception { + TestInit t = new TestInit(); + t.setUp(); + return t; + } + + static File getTestFolder() { + File testFolder = new File("temporaryTestFolder"); + testFolder.mkdir(); + return testFolder; + } + + public static UUID getServerUUID() { + return serverUUID; + } + + private void setUp() throws Exception { + planMock = PowerMockito.mock(Plan.class); + + StaticHolder.register(Plan.class, planMock); + StaticHolder.register(planMock); + + // Hacks to make APF find classes + StaticHolder.register(IPlugin.class, planMock); + StaticHolder.saveInstance(this.getClass(), Plan.class); + StaticHolder.saveInstance(PowerMockRunner.class, Plan.class); + + Log.setDebugMode("console"); + + File testFolder = getTestFolder(); + when(planMock.getDataFolder()).thenReturn(testFolder); + + // Files + File config = new File(getClass().getResource("/config.yml").getPath()); + when(planMock.getResource("config.yml")).thenReturn(new FileInputStream(config)); + File analysis = new File(getClass().getResource("/web/server.html").getPath()); + when(planMock.getResource("/web/server.html")).thenReturn(new FileInputStream(analysis)); + File player = new File(getClass().getResource("/web/player.html").getPath()); + when(planMock.getResource("/web/player.html")).thenReturn(new FileInputStream(player)); + + File tempConfigFile = new File(planMock.getDataFolder(), "config.yml"); + Config iConfig = new Config(tempConfigFile, FileUtil.lines(planMock, "config.yml")) { + @Override + public void save() { + } + }; + when(planMock.getMainConfig()).thenReturn(iConfig); + + Server mockServer = mockServer(); + + when(planMock.getServer()).thenReturn(mockServer); + + // Test log settings + when(planMock.getLogger()).thenReturn(Logger.getGlobal()); + Settings.DEBUG.setValue(true); + + ServerVariableHolder serverVariableHolder = new ServerVariableHolder(mockServer); + + when(planMock.getVariable()).thenReturn(serverVariableHolder); + BukkitServerInfoManager bukkitServerInfoManager = PowerMockito.mock(BukkitServerInfoManager.class); + + DataCache dataCache = new DataCache(planMock) { + @Override + public String getName(UUID uuid) { + return ""; + } + }; + when(planMock.getDataCache()).thenReturn(dataCache); + + when(bukkitServerInfoManager.getServerUUID()).thenReturn(serverUUID); + when(planMock.getServerUuid()).thenReturn(serverUUID); + when(planMock.getServerInfoManager()).thenReturn(bukkitServerInfoManager); + ColorScheme cs = new ColorScheme(ChatColor.BLACK, ChatColor.BLACK, ChatColor.BLACK, ChatColor.BLACK); + when(planMock.getColorScheme()).thenReturn(cs); + initLocale(null); + + RunnableFactory.activateTestMode(); + } + + private Server mockServer() { + Server mockServer = PowerMockito.mock(Server.class); + + OfflinePlayer[] ops = new OfflinePlayer[]{MockUtils.mockPlayer(), MockUtils.mockPlayer2()}; + + when(mockServer.getIp()).thenReturn("0.0.0.0"); + when(mockServer.getMaxPlayers()).thenReturn(20); + when(mockServer.getName()).thenReturn("Bukkit"); + when(mockServer.getOfflinePlayers()).thenReturn(ops); + ConsoleCommandSender sender = mockServerCmdSender(); + when(mockServer.getConsoleSender()).thenReturn(sender); + return mockServer; + } + + private ConsoleCommandSender mockServerCmdSender() { + return new ConsoleCommandSender() { + @Override + public void sendMessage(String s) { + System.out.println("Log: " + s); + } + + @Override + public void sendMessage(String[] strings) { + for (String string : strings) { + sendMessage(string); + } + } + + @Override + public Server getServer() { + return null; + } + + @Override + public String getName() { + return null; + } + + @Override + public Spigot spigot() { + return null; + } + + @Override + public boolean isConversing() { + return false; + } + + @Override + public void acceptConversationInput(String s) { + + } + + @Override + public boolean beginConversation(Conversation conversation) { + return false; + } + + @Override + public void abandonConversation(Conversation conversation) { + + } + + @Override + public void abandonConversation(Conversation conversation, ConversationAbandonedEvent conversationAbandonedEvent) { + + } + + @Override + public void sendRawMessage(String s) { + + } + + @Override + public boolean isPermissionSet(String s) { + return false; + } + + @Override + public boolean isPermissionSet(Permission permission) { + return false; + } + + @Override + public boolean hasPermission(String s) { + return false; + } + + @Override + public boolean hasPermission(Permission permission) { + return false; + } + + @Override + public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b) { + return null; + } + + @Override + public PermissionAttachment addAttachment(Plugin plugin) { + return null; + } + + @Override + public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b, int i) { + return null; + } + + @Override + public PermissionAttachment addAttachment(Plugin plugin, int i) { + return null; + } + + @Override + public void removeAttachment(PermissionAttachment permissionAttachment) { + + } + + @Override + public void recalculatePermissions() { + + } + + @Override + public Set getEffectivePermissions() { + return null; + } + + @Override + public boolean isOp() { + return false; + } + + @Override + public void setOp(boolean b) { + + } + }; + } + + private YamlConfiguration mockConfig() throws IOException, InvalidConfigurationException { + File configFile = new File(getClass().getResource("/config.yml").getPath()); + YamlConfiguration configuration = new YamlConfiguration(); + configuration.load(configFile.getAbsolutePath()); + return configuration; + } + + public Plan getPlanMock() { + return planMock; + } +} diff --git a/Plan/test/main/java/test/utilities/TestUtils.java b/Plan/test/main/java/test/utilities/TestUtils.java new file mode 100644 index 0000000000..3f56869668 --- /dev/null +++ b/Plan/test/main/java/test/utilities/TestUtils.java @@ -0,0 +1,18 @@ +/* + * 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 test.utilities; + +import java.lang.reflect.Field; + +/** + * @author Fuzzlemann + */ +public class TestUtils { + public static String getStringFieldValue(Enum enumeration, String modifier) throws NoSuchFieldException, IllegalAccessException { + Field field = enumeration.getClass().getDeclaredField(modifier); + field.setAccessible(true); + return (String) field.get(enumeration); + } +} diff --git a/Plan/test/test/java/utils/testsystem/TestConfigSystem.java b/Plan/test/test/java/utils/testsystem/TestConfigSystem.java deleted file mode 100644 index ad02855ea5..0000000000 --- a/Plan/test/test/java/utils/testsystem/TestConfigSystem.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 test.java.utils.testsystem; - -import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Scanner; - -/** - * //TODO Class Javadoc Comment - * - * @author Rsl1122 - */ -public class TestConfigSystem extends ConfigSystem { - - @Override - protected void copyDefaults() throws IOException { - File file = new File(getClass().getResource("/config.yml").getPath()); - Scanner scanner = new Scanner(new FileInputStream(file)); - - List lines = new ArrayList<>(); - while (scanner.hasNextLine()) { - lines.add(scanner.nextLine()); - } - config.copyDefaults(lines); - } -} \ No newline at end of file diff --git a/PlanPluginBridge/pom.xml b/PlanPluginBridge/pom.xml index 32e146d150..16dce44b83 100644 --- a/PlanPluginBridge/pom.xml +++ b/PlanPluginBridge/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.djrapitops PlanPluginBridge - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT jar ${project.groupId}:${project.artifactId} @@ -41,6 +41,14 @@ + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + paper-repo + https://repo.destroystokyo.com/repository/maven-public/ + vault-repo http://nexus.hc.to/content/repositories/pub_releases @@ -59,13 +67,22 @@ com.djrapitops Plan - 4.1.3 + 4.2.0-SNAPSHOT provided + com.destroystokyo.paper - paper - 1.12-R0.1-20170725.202533-1 + paper-api + 1.12.2-R0.1-SNAPSHOT + provided + + + + org.spigotmc + spigot-api + 1.12-R0.1-SNAPSHOT + jar provided @@ -184,7 +201,13 @@ + ${project.name} + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + org.apache.maven.plugins maven-source-plugin @@ -211,7 +234,7 @@ - + org.jacoco jacoco-maven-plugin diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java index 1a854c66d1..240671826d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java @@ -18,8 +18,8 @@ import com.djrapitops.pluginbridge.plan.towny.TownyHook; import com.djrapitops.pluginbridge.plan.vault.VaultHook; import com.djrapitops.pluginbridge.plan.viaversion.ViaVersionHook; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; -import main.java.com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.settings.Settings; /** * Manages connection to other plugins. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java index 3dbd3de201..8abe4ff9b3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java @@ -1,7 +1,7 @@ package com.djrapitops.pluginbridge.plan; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; -import main.java.com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.data.plugin.PluginData; import org.bukkit.plugin.java.JavaPlugin; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java index 60214db610..b55ca10036 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatData.java @@ -5,12 +5,12 @@ package com.djrapitops.pluginbridge.plan.aac; import com.djrapitops.plugin.utilities.Format; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; import java.util.Collection; import java.util.List; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java index 7243c898fb..22ca28af3d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/AdvancedAntiCheatHook.java @@ -6,10 +6,10 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; -import main.java.com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.database.databases.SQLDB; /** * Hook for AAC plugin. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/HackerTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/HackerTable.java index 45a868d856..17aec20a80 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/HackerTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/HackerTable.java @@ -5,13 +5,13 @@ */ package com.djrapitops.pluginbridge.plan.aac; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.tables.Table; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.tables.Table; import me.konsolas.aac.api.HackType; import java.sql.PreparedStatement; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java index 28a234e7c4..c07f96a4f3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java @@ -7,10 +7,10 @@ import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.systems.processing.Processor; -import main.java.com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.utilities.MiscUtils; import me.konsolas.aac.api.AACAPIProvider; import me.konsolas.aac.api.HackType; import me.konsolas.aac.api.PlayerViolationCommandEvent; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java index 32d0f58657..a7901bf99d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java @@ -6,13 +6,13 @@ import com.djrapitops.plugin.api.TimeAmount; import com.hm.achievement.api.AdvancedAchievementsAPI; -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.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.MiscUtils; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; import java.util.Collection; import java.util.Map; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java index 2fbb27e067..98729ff8e5 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsHook.java @@ -4,8 +4,8 @@ import com.hm.achievement.AdvancedAchievements; import com.hm.achievement.api.AdvancedAchievementsAPI; import com.hm.achievement.api.AdvancedAchievementsBukkitAPI; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java index bf3c615ca0..4753777901 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockData.java @@ -5,10 +5,10 @@ package com.djrapitops.pluginbridge.plan.askyblock; import com.wasteofplastic.askyblock.ASkyBlockAPI; -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.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; import java.util.Collection; import java.util.UUID; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java index aadd1a465b..27605cc3ad 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/askyblock/ASkyBlockHook.java @@ -2,8 +2,8 @@ import com.djrapitops.pluginbridge.plan.Hook; import com.wasteofplastic.askyblock.ASkyBlockAPI; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to ASkyBlock and registering data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java index 686af5949d..886aeeb0ac 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerData.java @@ -4,14 +4,14 @@ */ package com.djrapitops.pluginbridge.plan.banmanager; -import main.java.com.djrapitops.plan.Plan; -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.BanData; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.BanData; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.Html; import me.confuser.banmanager.BmAPI; import me.confuser.banmanager.data.PlayerBanData; import me.confuser.banmanager.data.PlayerMuteData; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java index a435a2c7da..e6cc68aea4 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/banmanager/BanManagerHook.java @@ -5,7 +5,7 @@ package com.djrapitops.pluginbridge.plan.banmanager; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.data.plugin.HookHandler; /** * Hook for BanManager plugin. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java index 966c93acaf..b134c4877b 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsData.java @@ -7,11 +7,11 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import com.earth2me.essentials.UserMap; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; import java.util.*; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java index 8b4564e1c5..8d15b8f4af 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/essentials/EssentialsHook.java @@ -2,8 +2,8 @@ import com.djrapitops.pluginbridge.plan.Hook; import com.earth2me.essentials.Essentials; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java index c82bb6eb42..5cfbe98cce 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java @@ -6,13 +6,13 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPlayer; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.container.Session; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.analysis.Analysis; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.analysis.Analysis; +import com.djrapitops.plan.utilities.html.HtmlStructure; import java.util.*; import java.util.stream.Collectors; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java index 9acd67b207..2bdbb4cc01 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsData.java @@ -7,14 +7,14 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MPlayer; -import main.java.com.djrapitops.plan.Plan; -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.ContainerSize; -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.html.Html; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.Html; import java.util.*; import java.util.stream.Collectors; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java index a56c64a360..a38866c753 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionsHook.java @@ -1,8 +1,8 @@ package com.djrapitops.pluginbridge.plan.factions; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to Factions and registering 4 data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java index bb591ef628..2b754abf9c 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionData.java @@ -5,12 +5,12 @@ package com.djrapitops.pluginbridge.plan.griefprevention; import com.djrapitops.plugin.utilities.FormatUtils; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.analysis.MathUtils; import me.ryanhamshire.GriefPrevention.Claim; import me.ryanhamshire.GriefPrevention.DataStore; import me.ryanhamshire.GriefPrevention.PlayerData; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java index 3a82a52032..4c0bcef0ba 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/griefprevention/GriefPreventionHook.java @@ -1,8 +1,8 @@ package com.djrapitops.pluginbridge.plan.griefprevention; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; import me.ryanhamshire.GriefPrevention.DataStore; import me.ryanhamshire.GriefPrevention.GriefPrevention; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java index f3a72e99c5..87c7852ef6 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsData.java @@ -6,13 +6,13 @@ import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.dao.JobsDAOData; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; import java.util.*; import java.util.stream.Collectors; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java index 7b8b1c3f25..4d559e104e 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/jobs/JobsHook.java @@ -1,8 +1,8 @@ package com.djrapitops.pluginbridge.plan.jobs; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to Jobs and registering data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java index eaceae8657..a88f6d883e 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java @@ -4,11 +4,11 @@ */ package com.djrapitops.pluginbridge.plan.kingdoms; -import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.container.Session; -import main.java.com.djrapitops.plan.utilities.analysis.Analysis; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.utilities.analysis.Analysis; +import com.djrapitops.plan.utilities.html.HtmlStructure; import org.kingdoms.constants.kingdom.OfflineKingdom; import java.util.*; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java index 8bcebc6b33..6f6794cd03 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsData.java @@ -4,12 +4,12 @@ */ package com.djrapitops.pluginbridge.plan.kingdoms; -import main.java.com.djrapitops.plan.Plan; -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.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.html.Html; import org.kingdoms.constants.kingdom.OfflineKingdom; import org.kingdoms.constants.player.OfflineKingdomPlayer; import org.kingdoms.manager.game.GameManagement; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java index d2344bd730..cc140cbdec 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomsHook.java @@ -5,7 +5,7 @@ package com.djrapitops.pluginbridge.plan.kingdoms; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.data.plugin.HookHandler; /** * Hook for Kingdoms and Kingdoms+ plugins. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java index 7505962226..d71e603dcb 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansData.java @@ -5,15 +5,15 @@ package com.djrapitops.pluginbridge.plan.litebans; import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.BanData; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.BanData; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.html.Html; import java.sql.SQLException; import java.util.*; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansDatabaseQueries.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansDatabaseQueries.java index 8a23227e19..7aead16430 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansDatabaseQueries.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansDatabaseQueries.java @@ -1,8 +1,8 @@ package com.djrapitops.pluginbridge.plan.litebans; import litebans.api.Database; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.database.tables.Table; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.tables.Table; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java index a52eda276d..5ed3e559e3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java @@ -2,8 +2,8 @@ import com.djrapitops.pluginbridge.plan.Hook; import litebans.api.Database; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to LiteBans and registering data diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java index ba007445e9..dcb15c9349 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McMmoData.java @@ -10,14 +10,14 @@ import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.UserManager; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.analysis.MathUtils; +import com.djrapitops.plan.utilities.html.Html; import org.apache.commons.lang3.StringUtils; import java.io.Serializable; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java index a838ca9c52..cd80c672d7 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/mcmmo/McmmoHook.java @@ -1,8 +1,8 @@ package com.djrapitops.pluginbridge.plan.mcmmo; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to MCMMO and registering data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java index 7ade96ac64..c2ad590770 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java @@ -8,9 +8,9 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.viaversion.ProtocolTable; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.systems.processing.Processor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java index 0c6cbdf29f..1af61894f3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportData.java @@ -7,11 +7,11 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.viaversion.Protocol; import com.djrapitops.pluginbridge.plan.viaversion.ProtocolTable; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; import java.sql.SQLException; import java.util.Collection; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java index 1215022d6e..5f529583b8 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/ProtocolSupportHook.java @@ -7,10 +7,10 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.Hook; import com.djrapitops.pluginbridge.plan.viaversion.ProtocolTable; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; -import main.java.com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.database.databases.SQLDB; /** * Hook for ProtocolSupport plugin. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java index a490194deb..139743ead1 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectData.java @@ -6,12 +6,12 @@ import br.net.fabiozumbi12.RedProtect.API.RedProtectAPI; import br.net.fabiozumbi12.RedProtect.Region; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; import java.util.Collection; import java.util.Set; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java index 2b155c8273..058bb96712 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/redprotect/RedProtectHook.java @@ -5,7 +5,7 @@ package com.djrapitops.pluginbridge.plan.redprotect; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.data.plugin.HookHandler; /** * Hook for RedProtect plugin. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java index 76255cb7ce..a826c78b71 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteData.java @@ -5,10 +5,10 @@ package com.djrapitops.pluginbridge.plan.superbvote; import io.minimum.minecraft.superbvote.storage.VoteStorage; -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.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; import java.util.Collection; import java.util.HashMap; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java index 86a3f24dfc..53d5b59600 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/superbvote/SuperbVoteHook.java @@ -3,8 +3,8 @@ import com.djrapitops.pluginbridge.plan.Hook; import io.minimum.minecraft.superbvote.SuperbVote; import io.minimum.minecraft.superbvote.storage.VoteStorage; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; import static org.bukkit.plugin.java.JavaPlugin.getPlugin; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java index 70f6b19211..399e4199ad 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java @@ -8,12 +8,12 @@ import com.palmergames.bukkit.towny.object.Coord; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.ServerProfile; -import main.java.com.djrapitops.plan.data.container.Session; -import main.java.com.djrapitops.plan.utilities.analysis.Analysis; -import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.container.Session; +import com.djrapitops.plan.utilities.analysis.Analysis; +import com.djrapitops.plan.utilities.html.HtmlStructure; import java.util.*; import java.util.stream.Collectors; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java index 6077f62d2a..00215b3904 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyData.java @@ -10,13 +10,13 @@ import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; import com.palmergames.bukkit.towny.object.TownyUniverse; -import main.java.com.djrapitops.plan.Plan; -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.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.settings.Settings; -import main.java.com.djrapitops.plan.utilities.html.Html; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.settings.Settings; +import com.djrapitops.plan.utilities.html.Html; import java.util.*; import java.util.stream.Collectors; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java index 62c75ee819..7c66869ddd 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownyHook.java @@ -1,8 +1,8 @@ package com.djrapitops.pluginbridge.plan.towny; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; /** * A Class responsible for hooking to Towny and registering 2 data sources. diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java index fb936bbdf8..1412b65839 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultEcoData.java @@ -6,15 +6,15 @@ import com.djrapitops.plugin.utilities.Verify; import com.djrapitops.pluginbridge.plan.FakeOfflinePlayer; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.ServerProfile; -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.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.analysis.Analysis; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.FormatUtils; +import com.djrapitops.plan.utilities.analysis.Analysis; import net.milkbowl.vault.economy.Economy; import org.bukkit.OfflinePlayer; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java index c503b5c2d5..27288a6468 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultHook.java @@ -1,8 +1,8 @@ package com.djrapitops.pluginbridge.plan.vault; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.data.plugin.HookHandler; import net.milkbowl.vault.economy.Economy; import static org.bukkit.Bukkit.getServer; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java index 07dd0ca8d4..0956416876 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/vault/VaultPermData.java @@ -6,14 +6,14 @@ import com.djrapitops.plugin.utilities.Verify; import com.djrapitops.pluginbridge.plan.FakeOfflinePlayer; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.data.PlayerProfile; -import main.java.com.djrapitops.plan.data.ServerProfile; -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.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; -import main.java.com.djrapitops.plan.utilities.analysis.Analysis; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.data.PlayerProfile; +import com.djrapitops.plan.data.ServerProfile; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.utilities.analysis.Analysis; import net.milkbowl.vault.permission.Permission; import org.apache.commons.lang3.StringUtils; import org.bukkit.OfflinePlayer; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java index c282d6f082..b266584199 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java @@ -7,9 +7,9 @@ import com.djrapitops.plugin.api.utility.log.Log; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.database.databases.SQLDB; -import main.java.com.djrapitops.plan.systems.processing.Processor; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.systems.processing.Processor; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java index 3abdf690ce..43541b64d1 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java @@ -5,13 +5,13 @@ */ package com.djrapitops.pluginbridge.plan.viaversion; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -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; -import main.java.com.djrapitops.plan.database.processing.QueryStatement; -import main.java.com.djrapitops.plan.database.sql.Select; -import main.java.com.djrapitops.plan.database.tables.Table; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.database.processing.ExecStatement; +import com.djrapitops.plan.database.processing.QueryAllStatement; +import com.djrapitops.plan.database.processing.QueryStatement; +import com.djrapitops.plan.database.sql.Select; +import com.djrapitops.plan.database.tables.Table; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java index 2a41a4022e..7b92319b6f 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionData.java @@ -5,11 +5,11 @@ package com.djrapitops.pluginbridge.plan.viaversion; import com.djrapitops.plugin.api.utility.log.Log; -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.element.TableContainer; -import main.java.com.djrapitops.plan.data.plugin.ContainerSize; -import main.java.com.djrapitops.plan.data.plugin.PluginData; +import com.djrapitops.plan.data.element.AnalysisContainer; +import com.djrapitops.plan.data.element.InspectContainer; +import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.plugin.ContainerSize; +import com.djrapitops.plan.data.plugin.PluginData; import java.sql.SQLException; import java.util.Collection; diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java index 39ed17ed31..de6cd776dd 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ViaVersionHook.java @@ -2,11 +2,11 @@ import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.Hook; -import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.api.API; -import main.java.com.djrapitops.plan.api.exceptions.DBCreateTableException; -import main.java.com.djrapitops.plan.data.plugin.HookHandler; -import main.java.com.djrapitops.plan.database.databases.SQLDB; +import com.djrapitops.plan.Plan; +import com.djrapitops.plan.api.API; +import com.djrapitops.plan.api.exceptions.DBCreateTableException; +import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plan.database.databases.SQLDB; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.ViaAPI;