From 06d4d2fef23509894888fcf381153127aec85f9b Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 31 Aug 2019 10:27:24 +0300 Subject: [PATCH] Moved utilities.formatting -> delivery.formatting --- .../plan/gathering/listeners/bukkit/DeathEventListener.java | 4 ++-- .../plan/commands/subcommands/ListServersCommand.java | 2 +- .../plan/commands/subcommands/QInspectCommand.java | 4 ++-- .../commands/subcommands/manage/ManageBackupCommand.java | 4 ++-- .../com/djrapitops/plan/data/element/TableContainer.java | 2 +- .../com/djrapitops/plan/delivery/DeliveryUtilities.java | 2 +- .../plan/delivery/domain/container/DataContainer.java | 2 +- .../plan/delivery/domain/mutators/ActivityIndex.java | 2 +- .../plan/delivery/domain/mutators/PlayerKillMutator.java | 2 +- .../plan/delivery/domain/mutators/SessionsMutator.java | 2 +- .../formatting/DecimalFormatter.java | 2 +- .../formatting/EntityNameFormatter.java | 2 +- .../plan/{utilities => delivery}/formatting/Formatter.java | 2 +- .../plan/{utilities => delivery}/formatting/Formatters.java | 4 ++-- .../formatting/ItemNameFormatter.java | 2 +- .../formatting/PercentageFormatter.java | 2 +- .../formatting/PlaceholderReplacer.java | 2 +- .../formatting/time/ClockFormatter.java | 2 +- .../formatting/time/DateFormatter.java | 4 ++-- .../formatting/time/DateHolderFormatter.java | 4 ++-- .../formatting/time/DayFormatter.java | 2 +- .../formatting/time/ISO8601NoClockFormatter.java | 2 +- .../formatting/time/SecondFormatter.java | 2 +- .../formatting/time/TimeAmountFormatter.java | 4 ++-- .../formatting/time/YearFormatter.java | 2 +- .../delivery/rendering/html/structure/ServerAccordion.java | 2 +- .../plan/delivery/rendering/json/JSONFactory.java | 4 ++-- .../rendering/json/OnlineActivityOverviewJSONParser.java | 4 ++-- .../plan/delivery/rendering/json/PerformanceJSONParser.java | 4 ++-- .../rendering/json/PlayerBaseOverviewJSONParser.java | 4 ++-- .../plan/delivery/rendering/json/PlayerJSONParser.java | 4 ++-- .../delivery/rendering/json/PlayersTableJSONParser.java | 4 ++-- .../plan/delivery/rendering/json/PvPPvEJSONParser.java | 4 ++-- .../delivery/rendering/json/ServerOverviewJSONParser.java | 4 ++-- .../delivery/rendering/json/SessionsOverviewJSONParser.java | 4 ++-- .../com/djrapitops/plan/delivery/rendering/json/Trend.java | 2 +- .../plan/delivery/rendering/json/graphs/ProgressBar.java | 2 +- .../rendering/json/graphs/calendar/CalendarFactory.java | 2 +- .../rendering/json/graphs/calendar/PlayerCalendar.java | 2 +- .../rendering/json/graphs/calendar/ServerCalendar.java | 2 +- .../rendering/json/graphs/stack/ActivityStackGraph.java | 2 +- .../rendering/json/graphs/stack/StackGraphFactory.java | 4 ++-- .../rendering/json/network/NetworkOverviewJSONParser.java | 4 ++-- .../json/network/NetworkPlayerBaseOverviewJSONParser.java | 4 ++-- .../json/network/NetworkSessionsOverviewJSONParser.java | 4 ++-- .../djrapitops/plan/delivery/rendering/pages/DebugPage.java | 4 ++-- .../plan/delivery/rendering/pages/NetworkPage.java | 4 ++-- .../plan/delivery/rendering/pages/PageFactory.java | 2 +- .../plan/delivery/rendering/pages/PlayerPage.java | 6 +++--- .../plan/delivery/rendering/pages/PlayerPluginTab.java | 4 ++-- .../plan/delivery/rendering/pages/PlayersPage.java | 2 +- .../plan/delivery/rendering/pages/ServerPage.java | 4 ++-- .../plan/delivery/rendering/pages/ServerPluginTabs.java | 4 ++-- .../implementation/results/ExtensionDoubleData.java | 2 +- .../implementation/results/ExtensionNumberData.java | 2 +- .../djrapitops/plan/settings/config/WorldAliasSettings.java | 4 ++-- .../domain/mutators/formatting/DecimalFormatterTest.java | 2 +- .../mutators/formatting/TimeAmountFormatterDefaultTest.java | 2 +- .../formatting/TimeAmountFormatterExtraZerosTest.java | 2 +- .../gathering/listeners/sponge/SpongeDeathListener.java | 4 ++-- 60 files changed, 89 insertions(+), 89 deletions(-) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/DecimalFormatter.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/EntityNameFormatter.java (95%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/Formatter.java (94%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/Formatters.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/ItemNameFormatter.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/PercentageFormatter.java (95%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/PlaceholderReplacer.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/ClockFormatter.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/DateFormatter.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/DateHolderFormatter.java (91%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/DayFormatter.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/ISO8601NoClockFormatter.java (95%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/SecondFormatter.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/TimeAmountFormatter.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/{utilities => delivery}/formatting/time/YearFormatter.java (96%) diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java index c9d263cb2..cfd9b27aa 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java @@ -16,13 +16,13 @@ */ package com.djrapitops.plan.gathering.listeners.bukkit; +import com.djrapitops.plan.delivery.formatting.EntityNameFormatter; +import com.djrapitops.plan.delivery.formatting.ItemNameFormatter; import com.djrapitops.plan.gathering.cache.SessionCache; import com.djrapitops.plan.gathering.domain.Session; import com.djrapitops.plan.processing.Processing; import com.djrapitops.plan.processing.processors.player.MobKillProcessor; import com.djrapitops.plan.processing.processors.player.PlayerKillProcessor; -import com.djrapitops.plan.utilities.formatting.EntityNameFormatter; -import com.djrapitops.plan.utilities.formatting.ItemNameFormatter; import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.error.ErrorHandler; import org.bukkit.Material; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/ListServersCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/ListServersCommand.java index 8619c4210..13b1476ff 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/ListServersCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/ListServersCommand.java @@ -16,6 +16,7 @@ */ package com.djrapitops.plan.commands.subcommands; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.exceptions.database.DBOpException; import com.djrapitops.plan.identification.Server; import com.djrapitops.plan.settings.Permissions; @@ -26,7 +27,6 @@ import com.djrapitops.plan.settings.locale.lang.DeepHelpLang; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.objects.ServerQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plugin.command.ColorScheme; import com.djrapitops.plugin.command.CommandNode; import com.djrapitops.plugin.command.CommandType; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/QInspectCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/QInspectCommand.java index 60ce622eb..d03080000 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/QInspectCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/QInspectCommand.java @@ -22,6 +22,8 @@ import com.djrapitops.plan.delivery.domain.keys.PlayerKeys; import com.djrapitops.plan.delivery.domain.mutators.ActivityIndex; import com.djrapitops.plan.delivery.domain.mutators.GeoInfoMutator; import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.exceptions.database.DBOpException; import com.djrapitops.plan.gathering.domain.GeoInfo; import com.djrapitops.plan.identification.UUIDUtility; @@ -38,8 +40,6 @@ import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.containers.ContainerFetchQueries; import com.djrapitops.plan.utilities.MiscUtils; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plugin.command.CommandNode; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.Sender; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/manage/ManageBackupCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/manage/ManageBackupCommand.java index 0fde48ee5..5e769e24f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/manage/ManageBackupCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/manage/ManageBackupCommand.java @@ -16,6 +16,8 @@ */ package com.djrapitops.plan.commands.subcommands.manage; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.exceptions.database.DBInitException; import com.djrapitops.plan.exceptions.database.DBOpException; import com.djrapitops.plan.processing.Processing; @@ -31,8 +33,6 @@ import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.SQLiteDB; import com.djrapitops.plan.storage.database.queries.ServerAggregateQueries; import com.djrapitops.plan.storage.database.transactions.BackupCopyTransaction; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plugin.command.CommandNode; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.Sender; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/data/element/TableContainer.java b/Plan/common/src/main/java/com/djrapitops/plan/data/element/TableContainer.java index 2a12369ae..fe4484973 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/data/element/TableContainer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/data/element/TableContainer.java @@ -16,8 +16,8 @@ */ package com.djrapitops.plan.data.element; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.delivery.rendering.html.icon.Icon; -import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plugin.utilities.ArrayUtil; import java.io.Serializable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/DeliveryUtilities.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/DeliveryUtilities.java index e1ed02540..688198b9d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/DeliveryUtilities.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/DeliveryUtilities.java @@ -16,8 +16,8 @@ */ package com.djrapitops.plan.delivery; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.json.graphs.Graphs; -import com.djrapitops.plan.utilities.formatting.Formatters; import dagger.Lazy; import javax.inject.Inject; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/container/DataContainer.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/container/DataContainer.java index 90e186b93..4394d1531 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/container/DataContainer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/container/DataContainer.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.delivery.domain.container; import com.djrapitops.plan.delivery.domain.keys.Key; -import com.djrapitops.plan.utilities.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatter; import java.util.Map; import java.util.Optional; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/ActivityIndex.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/ActivityIndex.java index 3d6c03a3a..889696084 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/ActivityIndex.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/ActivityIndex.java @@ -18,8 +18,8 @@ package com.djrapitops.plan.delivery.domain.mutators; import com.djrapitops.plan.delivery.domain.container.DataContainer; import com.djrapitops.plan.delivery.domain.keys.PlayerKeys; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.gathering.domain.Session; -import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plugin.api.TimeAmount; import java.util.List; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayerKillMutator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayerKillMutator.java index 0ac85f8a4..37c244c6f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayerKillMutator.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayerKillMutator.java @@ -16,8 +16,8 @@ */ package com.djrapitops.plan.delivery.domain.mutators; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.gathering.domain.PlayerKill; -import com.djrapitops.plan.utilities.formatting.Formatters; import java.util.HashMap; import java.util.List; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/SessionsMutator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/SessionsMutator.java index de3a0a712..49a949da9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/SessionsMutator.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/SessionsMutator.java @@ -19,6 +19,7 @@ package com.djrapitops.plan.delivery.domain.mutators; import com.djrapitops.plan.delivery.domain.container.DataContainer; import com.djrapitops.plan.delivery.domain.keys.CommonKeys; import com.djrapitops.plan.delivery.domain.keys.SessionKeys; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.json.graphs.Graphs; import com.djrapitops.plan.delivery.rendering.json.graphs.pie.WorldPie; import com.djrapitops.plan.gathering.domain.PlayerDeath; @@ -27,7 +28,6 @@ import com.djrapitops.plan.gathering.domain.Session; import com.djrapitops.plan.gathering.domain.WorldTimes; import com.djrapitops.plan.settings.config.WorldAliasSettings; import com.djrapitops.plan.utilities.analysis.Median; -import com.djrapitops.plan.utilities.formatting.Formatters; import java.util.*; import java.util.function.Function; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/DecimalFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/DecimalFormatter.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/DecimalFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/DecimalFormatter.java index 5c5d9055f..24bbb51de 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/DecimalFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/DecimalFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting; +package com.djrapitops.plan.delivery.formatting; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/EntityNameFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/EntityNameFormatter.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/EntityNameFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/EntityNameFormatter.java index 1c062e591..3b3228d3f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/EntityNameFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/EntityNameFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting; +package com.djrapitops.plan.delivery.formatting; import com.djrapitops.plugin.utilities.Format; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/Formatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/Formatter.java similarity index 94% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/Formatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/Formatter.java index f3ad0b0e1..92fc5456d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/Formatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/Formatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting; +package com.djrapitops.plan.delivery.formatting; import java.util.function.Function; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/Formatters.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/Formatters.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/Formatters.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/Formatters.java index 8fa93c14e..697e14ffe 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/Formatters.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/Formatters.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting; +package com.djrapitops.plan.delivery.formatting; import com.djrapitops.plan.delivery.domain.DateHolder; +import com.djrapitops.plan.delivery.formatting.time.*; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.locale.Locale; -import com.djrapitops.plan.utilities.formatting.time.*; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/ItemNameFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/ItemNameFormatter.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/ItemNameFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/ItemNameFormatter.java index 0afa71fab..8190ccd14 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/ItemNameFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/ItemNameFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting; +package com.djrapitops.plan.delivery.formatting; import com.djrapitops.plugin.utilities.Format; import org.apache.commons.lang3.StringUtils; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/PercentageFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/PercentageFormatter.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/PercentageFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/PercentageFormatter.java index cdd9966a9..fe5890dd3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/PercentageFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/PercentageFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting; +package com.djrapitops.plan.delivery.formatting; /** * Formatter for percentages. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/PlaceholderReplacer.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/PlaceholderReplacer.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/PlaceholderReplacer.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/PlaceholderReplacer.java index 8b8c4f30b..c37cf18af 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/PlaceholderReplacer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/PlaceholderReplacer.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting; +package com.djrapitops.plan.delivery.formatting; import com.djrapitops.plan.delivery.domain.container.DataContainer; import com.djrapitops.plan.delivery.domain.keys.PlaceholderKey; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/ClockFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/ClockFormatter.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/ClockFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/ClockFormatter.java index 6e318d934..cc1a658b6 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/ClockFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/ClockFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DateFormatter.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DateFormatter.java index 98ef98ddf..8c8376163 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DateFormatter.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; import com.djrapitops.plan.settings.config.paths.PluginSettings; import com.djrapitops.plan.settings.config.paths.TimeSettings; import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.lang.GenericLang; -import com.djrapitops.plan.utilities.formatting.Formatter; import java.text.SimpleDateFormat; import java.util.TimeZone; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateHolderFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DateHolderFormatter.java similarity index 91% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateHolderFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DateHolderFormatter.java index cbf08728b..83126743d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateHolderFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DateHolderFormatter.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; import com.djrapitops.plan.delivery.domain.DateHolder; -import com.djrapitops.plan.utilities.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatter; /** * Formatter for a DateHolder object that uses a different formatter. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DayFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DayFormatter.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DayFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DayFormatter.java index 855a820d9..e3bcc8e04 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DayFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/DayFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/ISO8601NoClockFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/ISO8601NoClockFormatter.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/ISO8601NoClockFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/ISO8601NoClockFormatter.java index d543f9f99..0f41b05a2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/ISO8601NoClockFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/ISO8601NoClockFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.locale.Locale; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/SecondFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/SecondFormatter.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/SecondFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/SecondFormatter.java index 69ae45ffe..f0785ca3c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/SecondFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/SecondFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/TimeAmountFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/TimeAmountFormatter.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/TimeAmountFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/TimeAmountFormatter.java index 935bd2b31..f7321bdaa 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/TimeAmountFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/TimeAmountFormatter.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; -import com.djrapitops.plan.utilities.formatting.Formatter; import org.apache.commons.lang3.StringUtils; /** diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/YearFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/YearFormatter.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/YearFormatter.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/YearFormatter.java index af5870d4e..8c6367345 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/YearFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/time/YearFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.utilities.formatting.time; +package com.djrapitops.plan.delivery.formatting.time; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/structure/ServerAccordion.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/structure/ServerAccordion.java index 8753254d8..bfca1976e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/structure/ServerAccordion.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/structure/ServerAccordion.java @@ -22,10 +22,10 @@ import com.djrapitops.plan.delivery.domain.container.PlayerContainer; import com.djrapitops.plan.delivery.domain.keys.PerServerKeys; import com.djrapitops.plan.delivery.domain.keys.PlayerKeys; import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.delivery.rendering.json.graphs.Graphs; import com.djrapitops.plan.delivery.rendering.json.graphs.pie.WorldPie; import com.djrapitops.plan.gathering.domain.WorldTimes; -import com.djrapitops.plan.utilities.formatting.Formatter; import java.util.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java index a57b7bbea..79fb3f74b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java @@ -20,6 +20,8 @@ import com.djrapitops.plan.delivery.domain.DateObj; import com.djrapitops.plan.delivery.domain.mutators.PlayerKillMutator; import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator; import com.djrapitops.plan.delivery.domain.mutators.TPSMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.json.graphs.Graphs; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerPlayerDataTableQuery; import com.djrapitops.plan.gathering.cache.SessionCache; @@ -39,8 +41,6 @@ import com.djrapitops.plan.storage.database.queries.containers.AllPlayerContaine import com.djrapitops.plan.storage.database.queries.containers.ServerPlayersTableContainersQuery; import com.djrapitops.plan.storage.database.queries.objects.*; import com.djrapitops.plan.utilities.comparators.SessionStartComparator; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/OnlineActivityOverviewJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/OnlineActivityOverviewJSONParser.java index 788cdbfdb..8b8008ff5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/OnlineActivityOverviewJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/OnlineActivityOverviewJSONParser.java @@ -21,6 +21,8 @@ import com.djrapitops.plan.delivery.domain.mutators.PlayersOnlineResolver; import com.djrapitops.plan.delivery.domain.mutators.RetentionData; import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator; import com.djrapitops.plan.delivery.domain.mutators.TPSMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.gathering.domain.TPS; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.DisplaySettings; @@ -32,8 +34,6 @@ import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; import com.djrapitops.plan.storage.database.queries.objects.TPSQueries; import com.djrapitops.plan.storage.database.queries.objects.UserInfoQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PerformanceJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PerformanceJSONParser.java index 4f132f5a7..9dc166ac9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PerformanceJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PerformanceJSONParser.java @@ -17,14 +17,14 @@ package com.djrapitops.plan.delivery.rendering.json; import com.djrapitops.plan.delivery.domain.mutators.TPSMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.gathering.domain.TPS; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.DisplaySettings; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.objects.TPSQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerBaseOverviewJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerBaseOverviewJSONParser.java index 580d7beb3..5704a3628 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerBaseOverviewJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerBaseOverviewJSONParser.java @@ -16,6 +16,8 @@ */ package com.djrapitops.plan.delivery.rendering.json; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.TimeSettings; import com.djrapitops.plan.storage.database.DBSystem; @@ -23,8 +25,6 @@ import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.analysis.ActivityIndexQueries; import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerJSONParser.java index 09d9d90e1..76c624691 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerJSONParser.java @@ -19,6 +19,8 @@ package com.djrapitops.plan.delivery.rendering.json; import com.djrapitops.plan.delivery.domain.container.PlayerContainer; import com.djrapitops.plan.delivery.domain.keys.PlayerKeys; import com.djrapitops.plan.delivery.domain.mutators.*; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.html.Html; import com.djrapitops.plan.delivery.rendering.html.structure.ServerAccordion; import com.djrapitops.plan.delivery.rendering.json.graphs.Graphs; @@ -36,8 +38,6 @@ import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.containers.PlayerContainerQuery; import com.djrapitops.plan.storage.database.queries.objects.ServerQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import org.apache.commons.text.StringEscapeUtils; import javax.inject.Inject; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayersTableJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayersTableJSONParser.java index 5198f6705..8445d3d02 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayersTableJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayersTableJSONParser.java @@ -21,6 +21,8 @@ import com.djrapitops.plan.delivery.domain.keys.PlayerKeys; import com.djrapitops.plan.delivery.domain.mutators.ActivityIndex; import com.djrapitops.plan.delivery.domain.mutators.GeoInfoMutator; import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.html.Html; import com.djrapitops.plan.delivery.rendering.html.icon.Family; import com.djrapitops.plan.delivery.rendering.html.icon.Icon; @@ -29,8 +31,6 @@ import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.implementation.results.*; import com.djrapitops.plan.gathering.domain.GeoInfo; import com.djrapitops.plan.utilities.comparators.PlayerContainerLastPlayedComparator; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import java.util.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PvPPvEJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PvPPvEJSONParser.java index 229dc3896..0840b2fd4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PvPPvEJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PvPPvEJSONParser.java @@ -16,11 +16,11 @@ */ package com.djrapitops.plan.delivery.rendering.json; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.objects.KillQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/ServerOverviewJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/ServerOverviewJSONParser.java index 742b8425f..16a64a457 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/ServerOverviewJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/ServerOverviewJSONParser.java @@ -19,6 +19,8 @@ package com.djrapitops.plan.delivery.rendering.json; import com.djrapitops.plan.delivery.domain.DateHolder; import com.djrapitops.plan.delivery.domain.DateObj; import com.djrapitops.plan.delivery.domain.mutators.TPSMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.gathering.domain.TPS; import com.djrapitops.plan.identification.ServerInfo; import com.djrapitops.plan.settings.config.PlanConfig; @@ -32,8 +34,6 @@ import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries; import com.djrapitops.plan.storage.database.queries.objects.KillQueries; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; import com.djrapitops.plan.storage.database.queries.objects.TPSQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/SessionsOverviewJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/SessionsOverviewJSONParser.java index 32bbb0efe..fff4396cf 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/SessionsOverviewJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/SessionsOverviewJSONParser.java @@ -17,6 +17,8 @@ package com.djrapitops.plan.delivery.rendering.json; import com.djrapitops.plan.delivery.domain.mutators.TPSMutator; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.gathering.domain.GMTimes; import com.djrapitops.plan.gathering.domain.TPS; import com.djrapitops.plan.storage.database.DBSystem; @@ -24,8 +26,6 @@ import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; import com.djrapitops.plan.storage.database.queries.objects.TPSQueries; import com.djrapitops.plan.storage.database.queries.objects.WorldTimesQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import org.apache.commons.text.WordUtils; import javax.inject.Inject; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/Trend.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/Trend.java index 726bc3b79..8d02bac40 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/Trend.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/Trend.java @@ -16,7 +16,7 @@ */ package com.djrapitops.plan.delivery.rendering.json; -import com.djrapitops.plan.utilities.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatter; /** * Represents a trend in the data - used for JSON format. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/ProgressBar.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/ProgressBar.java index 07a24cebe..59835ce64 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/ProgressBar.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/ProgressBar.java @@ -16,7 +16,7 @@ */ package com.djrapitops.plan.delivery.rendering.json.graphs; -import com.djrapitops.plan.utilities.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatter; /** * Utility for creating Progress bars. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/CalendarFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/CalendarFactory.java index 75abf3080..ea7f61312 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/CalendarFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/CalendarFactory.java @@ -17,9 +17,9 @@ package com.djrapitops.plan.delivery.rendering.json.graphs.calendar; import com.djrapitops.plan.delivery.domain.container.PlayerContainer; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.theme.Theme; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/PlayerCalendar.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/PlayerCalendar.java index 542514741..b6e9ff005 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/PlayerCalendar.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/PlayerCalendar.java @@ -19,11 +19,11 @@ package com.djrapitops.plan.delivery.rendering.json.graphs.calendar; import com.djrapitops.plan.delivery.domain.container.PlayerContainer; import com.djrapitops.plan.delivery.domain.keys.PlayerKeys; import com.djrapitops.plan.delivery.domain.keys.SessionKeys; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.gathering.domain.PlayerKill; import com.djrapitops.plan.gathering.domain.Session; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; -import com.djrapitops.plan.utilities.formatting.Formatter; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/ServerCalendar.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/ServerCalendar.java index 58e2636b7..2d73456bf 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/ServerCalendar.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/calendar/ServerCalendar.java @@ -16,9 +16,9 @@ */ package com.djrapitops.plan.delivery.rendering.json.graphs.calendar; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; -import com.djrapitops.plan.utilities.formatting.Formatter; import java.util.Map; import java.util.NavigableMap; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java index 9977dd9fd..43167840e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.delivery.rendering.json.graphs.stack; import com.djrapitops.plan.delivery.domain.DateMap; import com.djrapitops.plan.delivery.domain.mutators.ActivityIndex; -import com.djrapitops.plan.utilities.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatter; import java.util.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/StackGraphFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/StackGraphFactory.java index 9eeedfdfb..a9b7a9829 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/StackGraphFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/StackGraphFactory.java @@ -17,10 +17,10 @@ package com.djrapitops.plan.delivery.rendering.json.graphs.stack; import com.djrapitops.plan.delivery.domain.DateMap; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkOverviewJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkOverviewJSONParser.java index 702e26f5b..1e7223cd3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkOverviewJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkOverviewJSONParser.java @@ -18,6 +18,8 @@ package com.djrapitops.plan.delivery.rendering.json.network; import com.djrapitops.plan.delivery.domain.DateHolder; import com.djrapitops.plan.delivery.domain.DateObj; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.json.Trend; import com.djrapitops.plan.identification.ServerInfo; import com.djrapitops.plan.settings.config.PlanConfig; @@ -28,8 +30,6 @@ import com.djrapitops.plan.storage.database.queries.analysis.NetworkActivityInde import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; import com.djrapitops.plan.storage.database.queries.objects.TPSQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkPlayerBaseOverviewJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkPlayerBaseOverviewJSONParser.java index 846e8d80c..c40e7864d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkPlayerBaseOverviewJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkPlayerBaseOverviewJSONParser.java @@ -16,6 +16,8 @@ */ package com.djrapitops.plan.delivery.rendering.json.network; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.json.Trend; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.TimeSettings; @@ -24,8 +26,6 @@ import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.analysis.NetworkActivityIndexQueries; import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkSessionsOverviewJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkSessionsOverviewJSONParser.java index 9255d7468..b7873016f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkSessionsOverviewJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkSessionsOverviewJSONParser.java @@ -16,11 +16,11 @@ */ package com.djrapitops.plan.delivery.rendering.json.network; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.objects.SessionQueries; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/DebugPage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/DebugPage.java index 44d5a30fe..46e794451 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/DebugPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/DebugPage.java @@ -18,6 +18,8 @@ package com.djrapitops.plan.delivery.rendering.pages; import com.djrapitops.plan.delivery.domain.DateHolder; import com.djrapitops.plan.delivery.domain.keys.SessionKeys; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.html.Html; import com.djrapitops.plan.delivery.rendering.html.icon.Icon; import com.djrapitops.plan.delivery.rendering.html.structure.TabsElement; @@ -28,8 +30,6 @@ import com.djrapitops.plan.identification.ServerInfo; import com.djrapitops.plan.identification.properties.ServerProperties; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.file.FileResource; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.version.VersionCheckSystem; import com.djrapitops.plugin.benchmarking.Benchmark; import com.djrapitops.plugin.benchmarking.Timings; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java index e7d59dbff..f1624efe5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/NetworkPage.java @@ -16,6 +16,8 @@ */ package com.djrapitops.plan.delivery.rendering.pages; +import com.djrapitops.plan.delivery.formatting.Formatters; +import com.djrapitops.plan.delivery.formatting.PlaceholderReplacer; import com.djrapitops.plan.exceptions.ParseException; import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerDataQuery; @@ -26,8 +28,6 @@ import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.file.PlanFiles; -import com.djrapitops.plan.utilities.formatting.Formatters; -import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; import com.djrapitops.plan.version.VersionCheckSystem; import java.util.List; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java index e2a252598..90b8e12a5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java @@ -17,6 +17,7 @@ package com.djrapitops.plan.delivery.rendering.pages; import com.djrapitops.plan.delivery.domain.container.PlayerContainer; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.exceptions.connection.NotFoundException; import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionPlayerDataQuery; @@ -29,7 +30,6 @@ import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.containers.ContainerFetchQueries; import com.djrapitops.plan.storage.database.queries.objects.ServerQueries; import com.djrapitops.plan.storage.file.PlanFiles; -import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.version.VersionCheckSystem; import com.djrapitops.plugin.benchmarking.Timings; import com.djrapitops.plugin.logging.debug.DebugLogger; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java index 863984e6a..2db8db330 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java @@ -18,6 +18,9 @@ package com.djrapitops.plan.delivery.rendering.pages; import com.djrapitops.plan.delivery.domain.container.PlayerContainer; import com.djrapitops.plan.delivery.domain.keys.PlayerKeys; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; +import com.djrapitops.plan.delivery.formatting.PlaceholderReplacer; import com.djrapitops.plan.delivery.rendering.html.Html; import com.djrapitops.plan.exceptions.ParseException; import com.djrapitops.plan.identification.ServerInfo; @@ -25,9 +28,6 @@ import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; import com.djrapitops.plan.storage.file.PlanFiles; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; -import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; import com.djrapitops.plan.version.VersionCheckSystem; import java.io.IOException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java index b3a45ed99..37300f507 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPluginTab.java @@ -16,6 +16,8 @@ */ package com.djrapitops.plan.delivery.rendering.pages; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.html.icon.Icon; import com.djrapitops.plan.delivery.rendering.html.structure.NavLink; import com.djrapitops.plan.delivery.rendering.html.structure.TabsElement; @@ -23,8 +25,6 @@ import com.djrapitops.plan.extension.ElementOrder; import com.djrapitops.plan.extension.FormatType; import com.djrapitops.plan.extension.implementation.TabInformation; import com.djrapitops.plan.extension.implementation.results.*; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import java.util.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayersPage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayersPage.java index ee0a6a3d2..08a35fc40 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayersPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayersPage.java @@ -16,13 +16,13 @@ */ package com.djrapitops.plan.delivery.rendering.pages; +import com.djrapitops.plan.delivery.formatting.PlaceholderReplacer; import com.djrapitops.plan.exceptions.ParseException; import com.djrapitops.plan.identification.ServerInfo; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.PluginSettings; import com.djrapitops.plan.settings.config.paths.ProxySettings; import com.djrapitops.plan.storage.file.PlanFiles; -import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; import com.djrapitops.plan.version.VersionCheckSystem; /** diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPage.java index e91918034..a8ceadadd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPage.java @@ -19,6 +19,8 @@ package com.djrapitops.plan.delivery.rendering.pages; import com.djrapitops.plan.delivery.domain.container.DataContainer; import com.djrapitops.plan.delivery.domain.container.RawDataContainer; import com.djrapitops.plan.delivery.domain.keys.AnalysisKeys; +import com.djrapitops.plan.delivery.formatting.Formatters; +import com.djrapitops.plan.delivery.formatting.PlaceholderReplacer; import com.djrapitops.plan.delivery.rendering.html.Html; import com.djrapitops.plan.exceptions.ParseException; import com.djrapitops.plan.extension.implementation.results.ExtensionData; @@ -31,8 +33,6 @@ import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.file.PlanFiles; -import com.djrapitops.plan.utilities.formatting.Formatters; -import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; import com.djrapitops.plan.version.VersionCheckSystem; import java.io.IOException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java index 1a818046f..95ef1c466 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/ServerPluginTabs.java @@ -16,6 +16,8 @@ */ package com.djrapitops.plan.delivery.rendering.pages; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.rendering.html.icon.Icon; import com.djrapitops.plan.delivery.rendering.html.structure.NavLink; import com.djrapitops.plan.delivery.rendering.html.structure.TabsElement; @@ -23,8 +25,6 @@ import com.djrapitops.plan.extension.ElementOrder; import com.djrapitops.plan.extension.FormatType; import com.djrapitops.plan.extension.implementation.TabInformation; import com.djrapitops.plan.extension.implementation.results.*; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import java.util.*; import java.util.stream.Collectors; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDoubleData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDoubleData.java index 970b4bd9f..7a8ded63c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDoubleData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionDoubleData.java @@ -16,7 +16,7 @@ */ package com.djrapitops.plan.extension.implementation.results; -import com.djrapitops.plan.utilities.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatter; /** * Represents double data returned by a DoubleProvider or PercentageProvider method. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionNumberData.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionNumberData.java index 72b3e137e..c987886f5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionNumberData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionNumberData.java @@ -16,8 +16,8 @@ */ package com.djrapitops.plan.extension.implementation.results; +import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.extension.FormatType; -import com.djrapitops.plan.utilities.formatting.Formatter; /** * Represents double data returned by a DoubleProvider or PercentageProvider method. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java index d1cf018d1..067e45d19 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java @@ -17,13 +17,13 @@ package com.djrapitops.plan.settings.config; import com.djrapitops.plan.delivery.domain.keys.SessionKeys; +import com.djrapitops.plan.delivery.formatting.Formatter; +import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.gathering.domain.GMTimes; import com.djrapitops.plan.gathering.domain.Session; import com.djrapitops.plan.gathering.domain.WorldTimes; import com.djrapitops.plan.processing.Processing; import com.djrapitops.plan.settings.config.paths.DisplaySettings; -import com.djrapitops.plan.utilities.formatting.Formatter; -import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.error.ErrorHandler; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/DecimalFormatterTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/DecimalFormatterTest.java index fd5d3fcdc..0b6d47782 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/DecimalFormatterTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/DecimalFormatterTest.java @@ -16,9 +16,9 @@ */ package com.djrapitops.plan.delivery.domain.mutators.formatting; +import com.djrapitops.plan.delivery.formatting.DecimalFormatter; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; -import com.djrapitops.plan.utilities.formatting.DecimalFormatter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterDefaultTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterDefaultTest.java index b4d8f2609..e4295d61a 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterDefaultTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterDefaultTest.java @@ -16,9 +16,9 @@ */ package com.djrapitops.plan.delivery.domain.mutators.formatting; +import com.djrapitops.plan.delivery.formatting.time.TimeAmountFormatter; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; -import com.djrapitops.plan.utilities.formatting.time.TimeAmountFormatter; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterExtraZerosTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterExtraZerosTest.java index 0828b20a6..80d68e699 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterExtraZerosTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/domain/mutators/formatting/TimeAmountFormatterExtraZerosTest.java @@ -16,9 +16,9 @@ */ package com.djrapitops.plan.delivery.domain.mutators.formatting; +import com.djrapitops.plan.delivery.formatting.time.TimeAmountFormatter; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.FormatSettings; -import com.djrapitops.plan.utilities.formatting.time.TimeAmountFormatter; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/SpongeDeathListener.java b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/SpongeDeathListener.java index ddf11d416..61bfd4b21 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/SpongeDeathListener.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/sponge/SpongeDeathListener.java @@ -16,13 +16,13 @@ */ package com.djrapitops.plan.gathering.listeners.sponge; +import com.djrapitops.plan.delivery.formatting.EntityNameFormatter; +import com.djrapitops.plan.delivery.formatting.ItemNameFormatter; import com.djrapitops.plan.gathering.cache.SessionCache; import com.djrapitops.plan.gathering.domain.Session; import com.djrapitops.plan.processing.Processing; import com.djrapitops.plan.processing.processors.player.MobKillProcessor; import com.djrapitops.plan.processing.processors.player.PlayerKillProcessor; -import com.djrapitops.plan.utilities.formatting.EntityNameFormatter; -import com.djrapitops.plan.utilities.formatting.ItemNameFormatter; import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.error.ErrorHandler; import org.spongepowered.api.data.key.Keys;