From 6073ddcea9646121c3c2ec085b6359e8f1266577 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Sun, 23 Dec 2018 00:20:42 -0600 Subject: [PATCH] Honor admin chat and reports config (#7) * Honor admin chat and reports config * Optimize imports --- .../oc/bukkit/analytics/LatencyReporter.java | 1 - .../tc/oc/bukkit/analytics/TickReporter.java | 1 - .../commons/bukkit/CommonsBukkitManifest.java | 11 ++++++-- .../bukkit/broadcast/BroadcastFormatter.java | 3 +-- .../bukkit/broadcast/BroadcastManifest.java | 3 +-- .../bukkit/broadcast/BroadcastParser.java | 3 +-- .../bukkit/broadcast/BroadcastScheduler.java | 5 ++-- .../bukkit/broadcast/BroadcastSender.java | 23 ++++++++-------- .../bukkit/broadcast/BroadcastSettings.java | 3 --- .../broadcast/model/BroadcastSchedule.java | 5 ++-- .../bukkit/broadcast/model/BroadcastSet.java | 1 - .../oc/commons/bukkit/channels/Channel.java | 3 +-- .../bukkit/channels/ChannelChatEvent.java | 3 +-- .../bukkit/channels/ChannelCommands.java | 5 ++-- .../bukkit/channels/ChannelConfiguration.java | 21 +++++++++++++++ .../bukkit/channels/ChannelRouter.java | 11 ++++---- .../bukkit/channels/SimpleChannel.java | 7 +++-- .../bukkit/channels/admin/AdminChannel.java | 5 ++-- .../bukkit/channels/server/ServerChannel.java | 5 ++-- .../bukkit/chat/CachingNameRenderer.java | 7 +++-- .../oc/commons/bukkit/chat/ChatAnnouncer.java | 22 ++++++++++----- .../oc/commons/bukkit/chat/ChatCreator.java | 17 ++++++------ .../commons/bukkit/chat/FullNameRenderer.java | 1 - .../oc/commons/bukkit/chat/LinkComponent.java | 1 - .../java/tc/oc/commons/bukkit/chat/Links.java | 1 - .../tc/oc/commons/bukkit/chat/NameStyle.java | 7 +++-- .../tc/oc/commons/bukkit/chat/NameType.java | 7 +++-- .../tc/oc/commons/bukkit/chat/Paginator.java | 11 ++++---- .../commons/bukkit/chat/PlayerComponent.java | 5 ++-- .../bukkit/chat/PlayerComponentRenderer.java | 1 - .../bukkit/chat/TemplateComponent.java | 3 +-- .../bukkit/chat/TextComponentRenderer.java | 1 - .../chat/TranslatableComponentRenderer.java | 13 +++++---- .../bukkit/chat/UserTextComponent.java | 1 - .../tc/oc/commons/bukkit/chat/UserURI.java | 1 - .../commons/bukkit/commands/CommandUtils.java | 7 +++-- .../bukkit/commands/GroupCommands.java | 7 +++-- .../commons/bukkit/commands/MiscCommands.java | 17 ++++++------ .../bukkit/commands/PermissionCommands.java | 11 ++++---- .../commands/PrettyPaginatedResult.java | 3 +-- .../bukkit/commands/ServerCommands.java | 17 +++++------- .../commands/ServerVisibilityCommands.java | 9 +++---- .../bukkit/commands/TraceCommands.java | 7 +++-- .../commons/bukkit/commands/UserCommands.java | 15 +++++------ .../commons/bukkit/commands/UserFinder.java | 9 +++---- .../bukkit/config/ExternalConfiguration.java | 3 +-- .../oc/commons/bukkit/debug/LeakListener.java | 3 +-- .../bukkit/event/PlayerServerChangeEvent.java | 5 ++-- .../commons/bukkit/event/UserLoginEvent.java | 5 ++-- .../bukkit/flairs/FlairConfiguration.java | 6 ++--- .../commons/bukkit/flairs/FlairRenderer.java | 5 +--- .../commons/bukkit/format/GameFormatter.java | 1 - .../bukkit/format/ServerFormatter.java | 5 ++-- .../commons/bukkit/format/UserFormatter.java | 9 +++---- .../commons/bukkit/freeze/PlayerFreezer.java | 17 +++++------- .../tc/oc/commons/bukkit/gui/Interface.java | 9 +++---- .../commons/bukkit/gui/InterfaceManager.java | 5 ++-- .../bukkit/gui/buttons/empty/EmptyButton.java | 2 +- .../gui/buttons/nextPage/NextPageButton.java | 4 +-- .../bukkit/gui/interfaces/ChestInterface.java | 7 +++-- .../interfaces/ChestOptionsPageInterface.java | 11 ++++---- .../gui/interfaces/ChestPageInterface.java | 11 ++++---- .../gui/interfaces/HopperInterface.java | 7 +++-- .../gui/interfaces/SinglePageInterface.java | 10 +++---- .../render/ChestRenderInterface.java | 12 ++++----- .../render/text/GridTextRenderInterface.java | 13 ++++----- .../commons/bukkit/hologram/HologramUtil.java | 9 +++---- .../hologram/content/HologramFrame.java | 5 ++-- .../bukkit/listeners/AppealAlertListener.java | 1 - .../listeners/InactivePlayerListener.java | 5 ++-- .../bukkit/listeners/LocaleListener.java | 1 - .../bukkit/listeners/LoginListener.java | 6 ++--- .../listeners/PermissionGroupListener.java | 3 +-- .../localization/LocalizationManifest.java | 3 +-- .../localization/LocalizedDocument.java | 7 +++-- .../localization/LocalizedMessageMap.java | 9 +++---- .../bukkit/localization/MessageMapParser.java | 1 - .../bukkit/localization/MessageTemplate.java | 1 - .../bukkit/localization/PluginLocales.java | 1 - .../localization/PluginTranslations.java | 5 ++-- .../bukkit/localization/Translations.java | 5 ++-- .../commons/bukkit/logging/MapdevLogger.java | 1 - .../logging/MapdevSentryConfiguration.java | 1 - .../commons/bukkit/markup/MarkupParser.java | 5 ++-- .../commons/bukkit/nick/ConsoleIdentity.java | 1 - .../tc/oc/commons/bukkit/nick/Identity.java | 1 - .../oc/commons/bukkit/nick/IdentityImpl.java | 5 ++-- .../commons/bukkit/nick/IdentityProvider.java | 1 - .../bukkit/nick/IdentityProviderImpl.java | 3 +-- .../commons/bukkit/nick/NicknameCommands.java | 21 +++++++-------- .../bukkit/nick/NicknameConfiguration.java | 5 ++-- .../bukkit/nick/PlayerAppearanceChanger.java | 18 ++++++------- .../bukkit/nick/PlayerAppearanceListener.java | 1 - .../nick/PlayerIdentityChangeEvent.java | 4 +-- .../oc/commons/bukkit/nick/PlayerOrder.java | 1 - .../commons/bukkit/nick/PlayerOrderCache.java | 9 +++---- .../commons/bukkit/nick/UsernameRenderer.java | 3 +-- .../bukkit/punishment/PunishmentCommands.java | 27 ++++++++++--------- .../bukkit/punishment/PunishmentCreator.java | 3 +-- .../bukkit/punishment/PunishmentEnforcer.java | 9 +++---- .../punishment/PunishmentFormatter.java | 3 +-- .../punishment/PunishmentMessageSetting.java | 2 -- .../punishment/PunishmentPermissions.java | 3 +-- .../bukkit/raindrops/RaindropCommands.java | 5 ++-- .../bukkit/raindrops/RaindropManifest.java | 2 +- .../bukkit/raindrops/RaindropUtil.java | 3 +-- .../bukkit/report/ReportAnnouncer.java | 9 ++++--- .../commons/bukkit/report/ReportCommands.java | 16 +++++------ .../bukkit/report/ReportConfiguration.java | 14 +++++++--- .../commons/bukkit/report/ReportCreator.java | 3 +-- .../bukkit/report/ReportFormatter.java | 3 +-- .../bukkit/respack/ResourcePackCommands.java | 3 +-- .../bukkit/respack/ResourcePackListener.java | 3 +-- .../bukkit/respack/ResourcePackManager.java | 1 - .../bukkit/restart/RestartCommands.java | 5 ++-- .../bukkit/sessions/SessionListener.java | 5 ++-- .../bukkit/settings/RemoteTeleport.java | 2 -- .../settings/SettingManagerProvider.java | 3 +-- .../settings/SettingManagerProviderImpl.java | 3 +-- .../commons/bukkit/stats/StatsCommands.java | 5 ++-- .../tc/oc/commons/bukkit/stats/StatsUtil.java | 7 +++-- .../bukkit/tablist/DynamicTabEntry.java | 1 - .../bukkit/tablist/PlayerTabEntry.java | 1 - .../bukkit/tablist/SimpleTabEntry.java | 5 ++-- .../oc/commons/bukkit/tablist/TabEntry.java | 5 ++-- .../oc/commons/bukkit/tablist/TabManager.java | 7 +++-- .../oc/commons/bukkit/tablist/TabRender.java | 7 +++-- .../tc/oc/commons/bukkit/tablist/TabView.java | 4 +-- .../teleport/FeaturedServerTracker.java | 5 ++-- .../oc/commons/bukkit/teleport/Navigator.java | 15 +++++------ .../bukkit/teleport/NavigatorInterface.java | 17 ++++++------ .../bukkit/teleport/PlayerServerChanger.java | 7 +++-- .../bukkit/teleport/TeleportCommands.java | 5 ++-- .../bukkit/teleport/TeleportListener.java | 1 - .../commons/bukkit/teleport/Teleporter.java | 5 ++-- .../oc/commons/bukkit/ticket/TicketBooth.java | 9 +++---- .../commons/bukkit/ticket/TicketCommands.java | 5 ++-- .../commons/bukkit/ticket/TicketDisplay.java | 3 +-- .../commons/bukkit/ticket/TicketListener.java | 1 - .../commons/bukkit/tokens/TokenCommands.java | 9 ++++--- .../oc/commons/bukkit/tokens/TokenUtil.java | 5 ++-- .../commons/bukkit/trophies/TrophyCase.java | 13 +++++---- .../bukkit/trophies/TrophyCommands.java | 5 ++-- .../bukkit/users/JoinMessageAnnouncer.java | 15 +++++------ .../users/JoinMessageConfiguration.java | 1 - .../bukkit/users/JoinMessageSetting.java | 2 -- .../bukkit/users/PlayerSearchResponse.java | 1 - .../oc/commons/bukkit/util/ItemCreator.java | 8 ++++-- .../commons/bukkit/util/PermissionUtils.java | 1 - .../oc/commons/bukkit/util/PlayerStates.java | 3 +-- .../commons/bukkit/util/PlayerStatesImpl.java | 7 +++-- .../util/SyncPlayerExecutorFactory.java | 5 ++-- .../bukkit/whisper/WhisperCommands.java | 5 ++-- .../bukkit/whisper/WhisperDispatcher.java | 5 ++-- .../bukkit/whisper/WhisperFormatter.java | 1 - .../bukkit/whisper/WhisperManifest.java | 1 - .../bukkit/whisper/WhisperSettings.java | 2 -- .../commons/bukkit/whitelist/Whitelist.java | 3 +-- .../bukkit/whitelist/WhitelistCommands.java | 7 +++-- .../java/tc/oc/parse/DocumentWatcher.java | 5 ++-- .../commons/bukkit/geometry/CapsuleTest.java | 6 ++--- .../bukkit/geometry/LineSegmentTest.java | 6 ++--- .../bukkit/localization/LocalesTest.java | 8 +++--- .../localization/TranslationKeyTests.java | 5 ++-- 164 files changed, 435 insertions(+), 548 deletions(-) create mode 100644 Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelConfiguration.java diff --git a/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/LatencyReporter.java b/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/LatencyReporter.java index e45d450..2fe18ca 100644 --- a/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/LatencyReporter.java +++ b/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/LatencyReporter.java @@ -2,7 +2,6 @@ package tc.oc.bukkit.analytics; import java.time.Duration; import javax.inject.Inject; - import tc.oc.analytics.Gauge; import tc.oc.analytics.MetricFactory; import tc.oc.api.bukkit.users.OnlinePlayers; diff --git a/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/TickReporter.java b/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/TickReporter.java index d1dbbe7..07143d4 100644 --- a/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/TickReporter.java +++ b/Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/TickReporter.java @@ -3,7 +3,6 @@ package tc.oc.bukkit.analytics; import java.time.Duration; import java.util.concurrent.TimeUnit; import javax.inject.Inject; - import tc.oc.analytics.Count; import tc.oc.analytics.Gauge; import tc.oc.analytics.MetricFactory; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/CommonsBukkitManifest.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/CommonsBukkitManifest.java index 6ec2b04..3fc8cbb 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/CommonsBukkitManifest.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/CommonsBukkitManifest.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit; import javax.inject.Inject; - import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.ConsoleCommandSender; @@ -25,7 +24,15 @@ import tc.oc.commons.bukkit.chat.TextComponentRenderer; import tc.oc.commons.bukkit.chat.TranslatableComponentRenderer; import tc.oc.commons.bukkit.chat.UserTextComponent; import tc.oc.commons.bukkit.chat.UserTextComponentRenderer; -import tc.oc.commons.bukkit.commands.*; +import tc.oc.commons.bukkit.commands.GroupCommands; +import tc.oc.commons.bukkit.commands.MiscCommands; +import tc.oc.commons.bukkit.commands.PermissionCommands; +import tc.oc.commons.bukkit.commands.ServerCommands; +import tc.oc.commons.bukkit.commands.ServerVisibilityCommands; +import tc.oc.commons.bukkit.commands.SkinCommands; +import tc.oc.commons.bukkit.commands.TraceCommands; +import tc.oc.commons.bukkit.commands.UserCommands; +import tc.oc.commons.bukkit.commands.UserFinder; import tc.oc.commons.bukkit.debug.LeakListener; import tc.oc.commons.bukkit.event.targeted.TargetedEventManifest; import tc.oc.commons.bukkit.flairs.FlairConfiguration; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastFormatter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastFormatter.java index a9f9e29..dcc3aa7 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastFormatter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastFormatter.java @@ -1,8 +1,7 @@ package tc.oc.commons.bukkit.broadcast; -import java.util.Map; - import com.google.common.collect.ImmutableMap; +import java.util.Map; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastManifest.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastManifest.java index ce9e77c..7378468 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastManifest.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastManifest.java @@ -1,8 +1,7 @@ package tc.oc.commons.bukkit.broadcast; -import java.util.List; - import com.google.inject.TypeLiteral; +import java.util.List; import tc.oc.commons.bukkit.broadcast.model.BroadcastPrefix; import tc.oc.commons.bukkit.broadcast.model.BroadcastSchedule; import tc.oc.commons.bukkit.settings.SettingBinder; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastParser.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastParser.java index f83782f..b9334c0 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastParser.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastParser.java @@ -1,10 +1,9 @@ package tc.oc.commons.bukkit.broadcast; import java.nio.file.Path; +import java.time.Duration; import java.util.List; import javax.inject.Inject; - -import java.time.Duration; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastScheduler.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastScheduler.java index f90d521..9cebcdf 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastScheduler.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastScheduler.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.broadcast; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; @@ -10,9 +12,6 @@ import java.util.stream.Stream; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.command.ConsoleCommandSender; import tc.oc.api.bukkit.users.OnlinePlayers; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java index a4391f3..3e6f4db 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java @@ -1,11 +1,22 @@ package tc.oc.commons.bukkit.broadcast; +import static tc.oc.api.util.Permissions.hasPermissionForEnum; +import static tc.oc.commons.bukkit.commands.CommandUtils.newCommandException; +import static tc.oc.commons.bukkit.commands.CommandUtils.tryEnum; + import com.google.common.collect.Lists; import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissionsException; import com.sk89q.minecraft.util.commands.SuggestionContext; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TranslatableComponent; @@ -32,18 +43,6 @@ import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.formatting.StringUtils; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static tc.oc.api.util.Permissions.hasPermissionForEnum; -import static tc.oc.commons.bukkit.commands.CommandUtils.newCommandException; -import static tc.oc.commons.bukkit.commands.CommandUtils.tryEnum; - /** * Allows {@link User}s to broadcast {@link Chat} messages across multiple servers. */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSettings.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSettings.java index 2d9729a..44a2cde 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSettings.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSettings.java @@ -1,16 +1,13 @@ package tc.oc.commons.bukkit.broadcast; import javax.inject.Inject; - import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingBuilder; import me.anxuiz.settings.types.BooleanType; -import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.commons.bukkit.broadcast.model.BroadcastPrefix; import tc.oc.commons.bukkit.settings.SettingManagerProvider; -import tc.oc.commons.bukkit.util.ItemCreator; public class BroadcastSettings { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSchedule.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSchedule.java index 8f83698..03f357e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSchedule.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSchedule.java @@ -1,10 +1,9 @@ package tc.oc.commons.bukkit.broadcast.model; -import java.util.List; -import java.util.stream.Stream; - import com.google.common.collect.ImmutableList; import java.time.Duration; +import java.util.List; +import java.util.stream.Stream; import tc.oc.commons.core.inspect.Inspectable; import tc.oc.commons.core.stream.Collectors; import tc.oc.minecraft.server.ServerFilter; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSet.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSet.java index d8ca40c..f8c434b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSet.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSet.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.broadcast.model; import java.nio.file.Path; - import tc.oc.commons.core.inspect.Inspectable; public class BroadcastSet extends Inspectable.Impl { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/Channel.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/Channel.java index eb301ed..db02f88 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/Channel.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/Channel.java @@ -1,13 +1,12 @@ package tc.oc.commons.bukkit.channels; +import javax.annotation.Nullable; import org.bukkit.command.CommandSender; import tc.oc.api.docs.Chat; import tc.oc.api.docs.PlayerId; import tc.oc.api.docs.virtual.ChatDoc; import tc.oc.commons.core.chat.Audience; -import javax.annotation.Nullable; - /** * An {@link Audience} that sends {@link Chat} messages to the API. */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelChatEvent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelChatEvent.java index 845e5b0..40b4dac 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelChatEvent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelChatEvent.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.channels; +import javax.annotation.Nullable; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import tc.oc.api.docs.PlayerId; -import javax.annotation.Nullable; - /** * Called when a command sender chats in a local {@link Channel}. * If cancelled, the message will not be seen by users or reported to the API. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java index 503010d..63efbf0 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java @@ -4,6 +4,8 @@ import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissionsException; +import javax.inject.Inject; +import javax.inject.Singleton; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -18,9 +20,6 @@ import tc.oc.commons.bukkit.util.SyncPlayerExecutorFactory; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.TranslatableCommandException; -import javax.inject.Inject; -import javax.inject.Singleton; - @Singleton public class ChannelCommands implements Commands, Listener { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelConfiguration.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelConfiguration.java new file mode 100644 index 0000000..23b0f8c --- /dev/null +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelConfiguration.java @@ -0,0 +1,21 @@ +package tc.oc.commons.bukkit.channels; + +import javax.inject.Inject; +import org.bukkit.configuration.Configuration; + +public class ChannelConfiguration { + + private final Configuration config; + + @Inject ChannelConfiguration(Configuration config) { + this.config = config; + } + + public boolean admin_enabled() { + return config.getBoolean("channels.admin.enabled", false); + } + + public boolean admin_cross_server() { + return config.getBoolean("channels.admin.cross-server", false); + } +} diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelRouter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelRouter.java index 1f8c56f..f878661 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelRouter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelRouter.java @@ -1,6 +1,11 @@ package tc.oc.commons.bukkit.channels; import com.google.common.util.concurrent.ListenableFuture; +import java.util.Optional; +import java.util.function.Function; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.bukkit.users.BukkitUserStore; @@ -12,12 +17,6 @@ import tc.oc.api.users.UserService; import tc.oc.commons.bukkit.channels.admin.AdminChannel; import tc.oc.commons.bukkit.channels.server.ServerChannel; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.util.Optional; -import java.util.function.Function; - /** * Get the {@link Channel} based on the {@link ChatDoc.Type}. */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/SimpleChannel.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/SimpleChannel.java index c077a8a..3fec6a1 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/SimpleChannel.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/SimpleChannel.java @@ -1,5 +1,8 @@ package tc.oc.commons.bukkit.channels; +import java.util.stream.Stream; +import javax.annotation.Nullable; +import javax.inject.Inject; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -17,10 +20,6 @@ import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.chat.MultiAudience; import tc.oc.commons.core.plugin.PluginFacet; -import javax.annotation.Nullable; -import javax.inject.Inject; -import java.util.stream.Stream; - public abstract class SimpleChannel implements MultiAudience, Channel, PluginFacet { @Inject protected Audiences audiences; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java index c8e79ee..1a5d563 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.channels.admin; +import javax.inject.Inject; +import javax.inject.Singleton; import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingBuilder; import me.anxuiz.settings.types.BooleanType; @@ -21,9 +23,6 @@ import tc.oc.commons.bukkit.permissions.PermissionRegistry; import tc.oc.commons.bukkit.settings.SettingManagerProvider; import tc.oc.commons.core.chat.Component; -import javax.inject.Inject; -import javax.inject.Singleton; - @Singleton public class AdminChannel extends SimpleChannel implements PermissibleChannel { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/server/ServerChannel.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/server/ServerChannel.java index b39b389..632175a 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/server/ServerChannel.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/server/ServerChannel.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.channels.server; +import javax.inject.Inject; +import javax.inject.Singleton; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.command.CommandSender; import tc.oc.api.docs.Chat; @@ -8,9 +10,6 @@ import tc.oc.commons.bukkit.channels.SimpleChannel; import tc.oc.commons.bukkit.chat.PlayerComponent; import tc.oc.commons.core.chat.Component; -import javax.inject.Inject; -import javax.inject.Singleton; - @Singleton public class ServerChannel extends SimpleChannel { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/CachingNameRenderer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/CachingNameRenderer.java index 080e839..1700d76 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/CachingNameRenderer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/CachingNameRenderer.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.chat; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import net.md_5.bungee.api.chat.BaseComponent; import tc.oc.commons.bukkit.nick.Identity; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatAnnouncer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatAnnouncer.java index eeca835..c32f3a5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatAnnouncer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatAnnouncer.java @@ -1,5 +1,8 @@ package tc.oc.commons.bukkit.chat; +import java.util.Optional; +import javax.inject.Inject; +import javax.inject.Singleton; import tc.oc.api.docs.Chat; import tc.oc.api.docs.Server; import tc.oc.api.docs.virtual.ChatDoc; @@ -10,17 +13,15 @@ import tc.oc.api.message.types.ModelUpdate; import tc.oc.api.servers.ServerStore; import tc.oc.commons.bukkit.broadcast.BroadcastSender; import tc.oc.commons.bukkit.channels.Channel; +import tc.oc.commons.bukkit.channels.ChannelConfiguration; import tc.oc.commons.bukkit.channels.ChannelRouter; import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.minecraft.scheduler.MainThreadExecutor; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.util.Optional; - @Singleton public class ChatAnnouncer implements PluginFacet, MessageListener { + private final ChannelConfiguration configuration; private final Server server; private final ServerStore serverStore; private final MessageQueue queue; @@ -28,13 +29,17 @@ public class ChatAnnouncer implements PluginFacet, MessageListener { private final ChannelRouter channelRouter; private final BroadcastSender broadcaster; - @Inject ChatAnnouncer(Server server, ServerStore serverStore, MessageQueue queue, MainThreadExecutor executor, ChannelRouter channelRouter, BroadcastSender broadcaster) { + @Inject + public ChatAnnouncer(ChannelConfiguration configuration, Server server, ServerStore serverStore, + MessageQueue queue, MainThreadExecutor executor, ChannelRouter channelRouter, + BroadcastSender broadcaster) { + this.configuration = configuration; this.server = server; + this.serverStore = serverStore; this.queue = queue; this.executor = executor; this.channelRouter = channelRouter; this.broadcaster = broadcaster; - this.serverStore = serverStore; } @Override @@ -69,7 +74,10 @@ public class ChatAnnouncer implements PluginFacet, MessageListener { case TEAM: return false; case ADMIN: - return remote; + if (!configuration.admin_cross_server() && !chat.server_id().equalsIgnoreCase(server._id())) { + return false; + } + return configuration.admin_enabled() && remote; case BROADCAST: return shouldAnnounce(chat.broadcast()); } diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java index bbbdc17..f86b73b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java @@ -1,7 +1,15 @@ package tc.oc.commons.bukkit.chat; +import static java.util.Optional.ofNullable; + import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import java.time.Duration; +import java.time.Instant; +import java.util.function.Consumer; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import tc.oc.api.docs.Chat; import tc.oc.api.docs.PlayerId; import tc.oc.api.docs.Server; @@ -14,15 +22,6 @@ import tc.oc.api.model.ModelService; import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.minecraft.api.event.Listener; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.time.Duration; -import java.time.Instant; -import java.util.function.Consumer; - -import static java.util.Optional.ofNullable; - @Singleton public class ChatCreator implements PluginFacet, Listener { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/FullNameRenderer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/FullNameRenderer.java index b9f8565..ca33b4b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/FullNameRenderer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/FullNameRenderer.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.chat; import javax.inject.Inject; - import net.md_5.bungee.api.chat.BaseComponent; import tc.oc.commons.bukkit.flairs.FlairRenderer; import tc.oc.commons.bukkit.nick.Identity; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java index f4949b5..fcdca50 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java @@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.chat; import java.net.URI; import java.net.URISyntaxException; import java.util.Optional; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.ClickEvent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Links.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Links.java index 5d7a0a8..88e3597 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Links.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Links.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.chat; import java.net.URI; import java.net.URISyntaxException; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameStyle.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameStyle.java index e77122e..0950ad4 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameStyle.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameStyle.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.chat; -import java.util.Collections; -import java.util.EnumSet; -import java.util.Set; - import com.google.common.collect.ForwardingSet; import com.google.common.collect.Sets; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Set; /** * The formatting properties for each different context in which names are displayed. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameType.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameType.java index eb2b41d..41316fe 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameType.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameType.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.chat; -import org.bukkit.command.CommandSender; -import tc.oc.commons.bukkit.nick.Identity; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Objects; - -import static com.google.common.base.Preconditions.checkNotNull; +import org.bukkit.command.CommandSender; +import tc.oc.commons.bukkit.nick.Identity; /** * These are the parameters that determine how a player's name is diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Paginator.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Paginator.java index f5f6294..7693cb6 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Paginator.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Paginator.java @@ -1,12 +1,14 @@ package tc.oc.commons.bukkit.chat; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; import java.util.Collection; import java.util.Iterator; import java.util.List; import javax.annotation.Nullable; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterators; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; @@ -16,9 +18,6 @@ import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.util.IndexedFunction; import tc.oc.commons.core.util.Numbers; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - public class Paginator { public static final int DEFAULT_PER_PAGE = 14; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java index e82c187..4d46814 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java @@ -1,15 +1,14 @@ package tc.oc.commons.bukkit.chat; +import static com.google.common.base.Preconditions.checkNotNull; + import java.util.List; import java.util.Objects; - import net.md_5.bungee.api.chat.BaseComponent; import tc.oc.commons.bukkit.nick.Identity; import tc.oc.commons.core.chat.ImmutableComponent; import tc.oc.commons.core.util.Utils; -import static com.google.common.base.Preconditions.checkNotNull; - /** * A component that renders as a player's name. * diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponentRenderer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponentRenderer.java index b9bbb83..755ec26 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponentRenderer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponentRenderer.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.chat; import javax.inject.Inject; import javax.inject.Singleton; - import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.command.CommandSender; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java index 41d9d46..958342d 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java @@ -1,8 +1,7 @@ package tc.oc.commons.bukkit.chat; -import java.util.List; - import com.google.common.collect.ImmutableList; +import java.util.List; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.command.CommandSender; import tc.oc.commons.bukkit.localization.MessageTemplate; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TextComponentRenderer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TextComponentRenderer.java index cce9974..99bdc4e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TextComponentRenderer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TextComponentRenderer.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.chat; import javax.inject.Singleton; - import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.command.CommandSender; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TranslatableComponentRenderer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TranslatableComponentRenderer.java index 671b415..5c1214f 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TranslatableComponentRenderer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TranslatableComponentRenderer.java @@ -1,17 +1,16 @@ package tc.oc.commons.bukkit.chat; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.TranslatableComponent; -import org.bukkit.command.CommandSender; -import tc.oc.commons.bukkit.localization.Translator; -import tc.oc.commons.core.chat.Component; -import tc.oc.commons.core.chat.Components; - import java.text.MessageFormat; import java.util.List; import java.util.Optional; import javax.inject.Inject; import javax.inject.Singleton; +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.api.chat.TranslatableComponent; +import org.bukkit.command.CommandSender; +import tc.oc.commons.bukkit.localization.Translator; +import tc.oc.commons.core.chat.Component; +import tc.oc.commons.core.chat.Components; @Singleton public class TranslatableComponentRenderer extends BaseComponentRenderer { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserTextComponent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserTextComponent.java index 3a4d6ba..bba11b5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserTextComponent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserTextComponent.java @@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.chat; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserURI.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserURI.java index d54c042..24cfa95 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserURI.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserURI.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.chat; import java.net.URI; import java.util.Optional; - import org.bukkit.command.CommandSender; import tc.oc.commons.bukkit.nick.Identity; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/CommandUtils.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/CommandUtils.java index 0d433b4..0500781 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/CommandUtils.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/CommandUtils.java @@ -1,5 +1,8 @@ package tc.oc.commons.bukkit.commands; +import com.sk89q.minecraft.util.commands.CommandContext; +import com.sk89q.minecraft.util.commands.CommandException; +import com.sk89q.minecraft.util.commands.CommandPermissionsException; import java.time.Duration; import java.time.format.DateTimeParseException; import java.util.ArrayList; @@ -10,10 +13,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; - -import com.sk89q.minecraft.util.commands.CommandContext; -import com.sk89q.minecraft.util.commands.CommandException; -import com.sk89q.minecraft.util.commands.CommandPermissionsException; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TranslatableComponent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/GroupCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/GroupCommands.java index 02fe677..1c5b6bb 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/GroupCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/GroupCommands.java @@ -5,6 +5,9 @@ import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissionsException; import com.sk89q.minecraft.util.commands.NestedCommand; +import java.time.Duration; +import java.time.Instant; +import javax.inject.Inject; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import tc.oc.api.bukkit.users.BukkitUserStore; @@ -18,10 +21,6 @@ import tc.oc.commons.core.concurrent.Flexecutor; import tc.oc.commons.core.util.ThrowingBiConsumer; import tc.oc.minecraft.scheduler.Sync; -import javax.inject.Inject; -import java.time.Duration; -import java.time.Instant; - public class GroupCommands implements NestedCommands { public static class Parent implements Commands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java index 6ed8ddf..bb70d1c 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java @@ -5,6 +5,14 @@ import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.CommandPermissionsException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.Bukkit; @@ -29,15 +37,6 @@ import tc.oc.commons.core.util.Streams; import tc.oc.minecraft.protocol.MinecraftVersion; import tc.oc.minecraft.scheduler.Sync; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Stream; - /** * Commands for miscellaneous purposes. */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PermissionCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PermissionCommands.java index b3a1332..f84411a 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PermissionCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PermissionCommands.java @@ -5,6 +5,11 @@ import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.NestedCommand; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; @@ -14,12 +19,6 @@ import tc.oc.api.util.Permissions; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.NestedCommands; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - public class PermissionCommands implements NestedCommands { public static class Parent implements Commands { @Command( diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PrettyPaginatedResult.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PrettyPaginatedResult.java index 08e779f..7667731 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PrettyPaginatedResult.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PrettyPaginatedResult.java @@ -4,11 +4,10 @@ import com.google.common.base.Preconditions; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.WrappedCommandSender; import com.sk89q.minecraft.util.pagination.PaginatedResult; +import java.util.List; import net.md_5.bungee.api.ChatColor; import tc.oc.commons.core.chat.ChatUtils; -import java.util.List; - public abstract class PrettyPaginatedResult extends PaginatedResult { protected final String header; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java index 9549681..45774d4 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java @@ -1,19 +1,16 @@ package tc.oc.commons.bukkit.commands; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; -import com.sk89q.minecraft.util.commands.CommandPermissionsException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import java.util.function.Consumer; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerVisibilityCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerVisibilityCommands.java index e1aa965..e32373e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerVisibilityCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerVisibilityCommands.java @@ -1,14 +1,13 @@ package tc.oc.commons.bukkit.commands; -import java.util.EnumSet; -import java.util.logging.Logger; -import javax.inject.Inject; - import com.google.common.util.concurrent.ListenableFuture; import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; +import java.util.EnumSet; +import java.util.logging.Logger; +import javax.inject.Inject; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,12 +18,12 @@ import org.bukkit.event.player.PlayerQuitEvent; import tc.oc.api.docs.Server; import tc.oc.api.docs.virtual.ServerDoc; import tc.oc.api.minecraft.MinecraftService; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.commons.bukkit.event.WhitelistStateChangeEvent; import tc.oc.commons.bukkit.whitelist.Whitelist; import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.logging.Loggers; +import tc.oc.minecraft.scheduler.SyncExecutor; public class ServerVisibilityCommands implements Listener, Commands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/TraceCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/TraceCommands.java index aec0f2f..a272e5e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/TraceCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/TraceCommands.java @@ -1,13 +1,14 @@ package tc.oc.commons.bukkit.commands; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.inject.Inject; +import static tc.oc.commons.bukkit.commands.CommandUtils.getCommandSenderOrSelf; import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.NestedCommand; +import java.util.concurrent.atomic.AtomicBoolean; +import javax.inject.Inject; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.craftbukkit.event.AsyncClientConnectEvent; @@ -20,8 +21,6 @@ import tc.oc.commons.bukkit.util.PacketTracer; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.NestedCommands; -import static tc.oc.commons.bukkit.commands.CommandUtils.getCommandSenderOrSelf; - /** * Packet tracing commands */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserCommands.java index 45f162c..04e34ac 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserCommands.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.commands; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; @@ -17,16 +16,14 @@ import tc.oc.api.docs.User; import tc.oc.api.friendships.FriendshipRequest; import tc.oc.api.friendships.FriendshipService; import tc.oc.api.minecraft.MinecraftService; -import tc.oc.commons.bukkit.chat.Audiences; -import tc.oc.commons.bukkit.chat.Links; -import tc.oc.commons.bukkit.chat.NameStyle; -import tc.oc.commons.bukkit.chat.PlayerComponent; -import tc.oc.commons.core.util.Lazy; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.sessions.SessionService; +import tc.oc.commons.bukkit.chat.Audiences; import tc.oc.commons.bukkit.chat.ComponentPaginator; import tc.oc.commons.bukkit.chat.ComponentRenderers; import tc.oc.commons.bukkit.chat.HeaderComponent; +import tc.oc.commons.bukkit.chat.Links; +import tc.oc.commons.bukkit.chat.NameStyle; +import tc.oc.commons.bukkit.chat.PlayerComponent; import tc.oc.commons.bukkit.format.UserFormatter; import tc.oc.commons.bukkit.nick.IdentityProvider; import tc.oc.commons.core.chat.Audience; @@ -34,6 +31,8 @@ import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.TranslatableCommandException; +import tc.oc.commons.core.util.Lazy; +import tc.oc.minecraft.scheduler.SyncExecutor; /** * Commands for querying and possibly manipulating user records diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java index 853d335..fbd56f3 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java @@ -1,15 +1,14 @@ package tc.oc.commons.bukkit.commands; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.bukkit.users.BukkitUserStore; @@ -21,10 +20,10 @@ import tc.oc.api.users.UserSearchRequest; import tc.oc.api.users.UserSearchResponse; import tc.oc.api.users.UserService; import tc.oc.commons.bukkit.nick.IdentityProvider; -import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.commons.bukkit.users.PlayerSearchResponse; import tc.oc.commons.core.commands.TranslatableCommandException; import tc.oc.commons.core.util.Orderable; +import tc.oc.minecraft.scheduler.MainThreadExecutor; @Singleton public class UserFinder { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/config/ExternalConfiguration.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/config/ExternalConfiguration.java index 615ee11..e3cb9c0 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/config/ExternalConfiguration.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/config/ExternalConfiguration.java @@ -7,15 +7,14 @@ import java.util.logging.Level; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; - import org.bukkit.configuration.Configuration; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; import tc.oc.commons.bukkit.logging.MapdevLogger; -import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.file.PathWatcher; import tc.oc.file.PathWatcherService; import tc.oc.minecraft.api.configuration.InvalidConfigurationException; +import tc.oc.minecraft.scheduler.MainThreadExecutor; /** * Base class for a configuration section that is loaded from the external diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/debug/LeakListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/debug/LeakListener.java index b918c1a..461774f 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/debug/LeakListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/debug/LeakListener.java @@ -1,14 +1,13 @@ package tc.oc.commons.bukkit.debug; +import java.time.Duration; import javax.annotation.Nullable; import javax.inject.Inject; - import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.world.WorldUnloadEvent; -import java.time.Duration; import tc.oc.api.bukkit.users.BukkitUserStore; import tc.oc.api.docs.virtual.Model; import tc.oc.api.model.ModelDispatcher; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/PlayerServerChangeEvent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/PlayerServerChangeEvent.java index 618784e..70de808 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/PlayerServerChangeEvent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/PlayerServerChangeEvent.java @@ -1,14 +1,13 @@ package tc.oc.commons.bukkit.event; -import javax.annotation.Nullable; +import static com.google.common.base.Preconditions.checkNotNull; +import javax.annotation.Nullable; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.PlayerAction; -import static com.google.common.base.Preconditions.checkNotNull; - public class PlayerServerChangeEvent extends ExtendedCancellable implements PlayerAction { private final Player player; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/UserLoginEvent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/UserLoginEvent.java index 222d75d..61deeaf 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/UserLoginEvent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/UserLoginEvent.java @@ -1,7 +1,8 @@ package tc.oc.commons.bukkit.event; -import javax.annotation.Nullable; +import static com.google.common.base.Preconditions.checkNotNull; +import javax.annotation.Nullable; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.entity.Player; import org.bukkit.event.Event; @@ -11,8 +12,6 @@ import tc.oc.api.docs.Session; import tc.oc.api.docs.User; import tc.oc.api.users.LoginResponse; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Fired from within {@link PlayerLoginEvent}, and inludes our {@link User} document. * It also fires after various login info has been loaded e.g. PlayerId, permissions, diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairConfiguration.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairConfiguration.java index 292b0bd..e594be2 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairConfiguration.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairConfiguration.java @@ -1,10 +1,10 @@ package tc.oc.commons.bukkit.flairs; +import static com.google.common.base.Preconditions.checkNotNull; + +import javax.inject.Inject; import org.bukkit.configuration.Configuration; import org.bukkit.configuration.ConfigurationSection; -import javax.inject.Inject; - -import static com.google.common.base.Preconditions.checkNotNull; public class FlairConfiguration { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairRenderer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairRenderer.java index d03ec42..d3a3036 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairRenderer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairRenderer.java @@ -1,13 +1,10 @@ package tc.oc.commons.bukkit.flairs; -import java.util.ArrayList; -import java.util.Collections; +import com.google.common.collect.ImmutableSet; import java.util.Set; import java.util.stream.Stream; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.collect.ImmutableSet; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import tc.oc.api.bukkit.users.BukkitUserStore; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/GameFormatter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/GameFormatter.java index e5f61a8..133be40 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/GameFormatter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/GameFormatter.java @@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.format; import java.util.Collection; import java.util.Optional; import javax.inject.Inject; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.ClickEvent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/ServerFormatter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/ServerFormatter.java index 3ff7f5a..f1a3990 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/ServerFormatter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/ServerFormatter.java @@ -1,17 +1,16 @@ package tc.oc.commons.bukkit.format; +import java.time.Duration; +import java.time.Instant; import java.util.Comparator; import java.util.Optional; import javax.annotation.Nullable; import javax.inject.Inject; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TranslatableComponent; -import java.time.Duration; -import java.time.Instant; import tc.oc.api.docs.virtual.MatchDoc; import tc.oc.api.docs.virtual.ServerDoc; import tc.oc.api.minecraft.MinecraftService; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/UserFormatter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/UserFormatter.java index 01edb6e..c0c70d2 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/UserFormatter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/UserFormatter.java @@ -1,19 +1,18 @@ package tc.oc.commons.bukkit.format; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.SetMultimap; +import java.time.Duration; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; import javax.inject.Inject; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.SetMultimap; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; -import java.time.Duration; -import java.time.Instant; import tc.oc.api.docs.Server; import tc.oc.api.docs.Session; import tc.oc.api.docs.virtual.ServerDoc; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/freeze/PlayerFreezer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/freeze/PlayerFreezer.java index 083771d..af53633 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/freeze/PlayerFreezer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/freeze/PlayerFreezer.java @@ -1,14 +1,15 @@ package tc.oc.commons.bukkit.freeze; -import java.time.Duration; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; -import javax.inject.Inject; -import javax.inject.Singleton; +import static tc.oc.minecraft.protocol.MinecraftVersion.MINECRAFT_1_8; +import static tc.oc.minecraft.protocol.MinecraftVersion.lessThan; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; +import java.time.Duration; +import java.util.Map; +import java.util.WeakHashMap; +import javax.inject.Inject; +import javax.inject.Singleton; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -18,14 +19,10 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.world.WorldUnloadEvent; import tc.oc.commons.bukkit.event.CoarsePlayerMoveEvent; import tc.oc.commons.bukkit.util.NMSHacks; -import tc.oc.commons.core.collection.WeakHashSet; import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.commons.core.util.Pair; import tc.oc.minecraft.api.scheduler.Tickable; -import static tc.oc.minecraft.protocol.MinecraftVersion.lessThan; -import static tc.oc.minecraft.protocol.MinecraftVersion.MINECRAFT_1_8; - /** * Freezes players by mounting them on an invisible minecart. */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/Interface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/Interface.java index 06b7b41..8f847f8 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/Interface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/Interface.java @@ -1,13 +1,12 @@ package tc.oc.commons.bukkit.gui; -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import tc.oc.commons.bukkit.gui.buttons.Button; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; +import tc.oc.commons.bukkit.gui.buttons.Button; public class Interface { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/InterfaceManager.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/InterfaceManager.java index 668a63e..92246dd 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/InterfaceManager.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/InterfaceManager.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.gui; +import java.util.ArrayList; +import java.util.List; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; @@ -7,9 +9,6 @@ import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; import tc.oc.commons.bukkit.gui.buttons.Button; -import java.util.ArrayList; -import java.util.List; - public class InterfaceManager { private static List inventories = new ArrayList<>(); diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/empty/EmptyButton.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/empty/EmptyButton.java index 8ba40cf..e420c67 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/empty/EmptyButton.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/empty/EmptyButton.java @@ -1,8 +1,8 @@ package tc.oc.commons.bukkit.gui.buttons.empty; +import org.bukkit.Material; import tc.oc.commons.bukkit.gui.buttons.Button; import tc.oc.commons.bukkit.util.ItemCreator; -import org.bukkit.Material; public class EmptyButton extends Button { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/nextPage/NextPageButton.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/nextPage/NextPageButton.java index 6dc1d19..72134e7 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/nextPage/NextPageButton.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/nextPage/NextPageButton.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.gui.buttons.nextPage; +import org.bukkit.Material; +import org.bukkit.entity.Player; import tc.oc.commons.bukkit.gui.Interface; import tc.oc.commons.bukkit.gui.InterfaceManager; import tc.oc.commons.bukkit.gui.buttons.Button; @@ -7,8 +9,6 @@ import tc.oc.commons.bukkit.gui.interfaces.ChestOptionsPageInterface; import tc.oc.commons.bukkit.gui.interfaces.SinglePageInterface; import tc.oc.commons.bukkit.util.Constants; import tc.oc.commons.bukkit.util.ItemCreator; -import org.bukkit.Material; -import org.bukkit.entity.Player; public class NextPageButton extends Button { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestInterface.java index 14bb728..700bf20 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestInterface.java @@ -1,14 +1,13 @@ package tc.oc.commons.bukkit.gui.interfaces; -import tc.oc.commons.bukkit.gui.Interface; -import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder; +import java.util.List; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; +import tc.oc.commons.bukkit.gui.Interface; +import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder; import tc.oc.commons.bukkit.gui.buttons.Button; -import java.util.List; - public class ChestInterface extends Interface { private int size; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestOptionsPageInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestOptionsPageInterface.java index ad80da0..a313eb5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestOptionsPageInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestOptionsPageInterface.java @@ -1,5 +1,10 @@ package tc.oc.commons.bukkit.gui.interfaces; +import java.util.ArrayList; +import java.util.List; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.entity.Player; import tc.oc.commons.bukkit.gui.Interface; import tc.oc.commons.bukkit.gui.buttons.Button; import tc.oc.commons.bukkit.gui.buttons.empty.EmptyButton; @@ -7,12 +12,6 @@ import tc.oc.commons.bukkit.gui.buttons.toggle.ToggleButton; import tc.oc.commons.bukkit.util.Constants; import tc.oc.commons.bukkit.util.ItemCreator; import tc.oc.commons.bukkit.util.ObjectUtils; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.List; /** * MultiPageInterfaces are a special group of interfaces. They aren't a single interface, but a collection of diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestPageInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestPageInterface.java index 8004ccc..5f231e1 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestPageInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestPageInterface.java @@ -1,17 +1,16 @@ package tc.oc.commons.bukkit.gui.interfaces; +import java.util.ArrayList; +import java.util.List; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; import tc.oc.commons.bukkit.gui.Interface; import tc.oc.commons.bukkit.gui.buttons.Button; import tc.oc.commons.bukkit.gui.buttons.empty.EmptyButton; import tc.oc.commons.bukkit.util.Constants; import tc.oc.commons.bukkit.util.ItemCreator; import tc.oc.commons.bukkit.util.ObjectUtils; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; - -import java.util.ArrayList; -import java.util.List; /** * MultiPageInterfaces are a special group of interfaces. They aren't a single interface, but a collection of diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/HopperInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/HopperInterface.java index 5262cde..0508a14 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/HopperInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/HopperInterface.java @@ -1,15 +1,14 @@ package tc.oc.commons.bukkit.gui.interfaces; -import tc.oc.commons.bukkit.gui.Interface; -import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder; +import java.util.List; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; +import tc.oc.commons.bukkit.gui.Interface; +import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder; import tc.oc.commons.bukkit.gui.buttons.Button; -import java.util.List; - public class HopperInterface extends Interface { private int size; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/SinglePageInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/SinglePageInterface.java index 9155fc3..b940548 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/SinglePageInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/SinglePageInterface.java @@ -1,17 +1,15 @@ package tc.oc.commons.bukkit.gui.interfaces; -import tc.oc.commons.bukkit.gui.Interface; +import java.util.ArrayList; +import java.util.List; +import org.bukkit.Material; +import org.bukkit.entity.Player; import tc.oc.commons.bukkit.gui.buttons.Button; import tc.oc.commons.bukkit.gui.buttons.empty.EmptyButton; import tc.oc.commons.bukkit.gui.buttons.nextPage.NextPageButton; import tc.oc.commons.bukkit.util.Constants; import tc.oc.commons.bukkit.util.ItemCreator; import tc.oc.commons.bukkit.util.ObjectUtils; -import org.bukkit.Material; -import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.List; /** * MultiPageInterfaces are a special group of interfaces. They aren't a single interface, but a collection of diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/ChestRenderInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/ChestRenderInterface.java index b065ce8..d4046a5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/ChestRenderInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/ChestRenderInterface.java @@ -1,16 +1,14 @@ package tc.oc.commons.bukkit.gui.interfaces.render; -import tc.oc.commons.bukkit.gui.Interface; -import tc.oc.commons.bukkit.gui.buttons.Button; -import tc.oc.commons.bukkit.gui.interfaces.ChestInterface; -import tc.oc.commons.bukkit.util.ItemCreator; +import java.util.ArrayList; +import java.util.List; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.List; +import tc.oc.commons.bukkit.gui.buttons.Button; +import tc.oc.commons.bukkit.gui.interfaces.ChestInterface; +import tc.oc.commons.bukkit.util.ItemCreator; public class ChestRenderInterface extends ChestInterface { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/text/GridTextRenderInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/text/GridTextRenderInterface.java index 561a8b1..817530c 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/text/GridTextRenderInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/text/GridTextRenderInterface.java @@ -1,15 +1,16 @@ package tc.oc.commons.bukkit.gui.interfaces.render.text; -import tc.oc.commons.bukkit.gui.Interface; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.entity.Player; import tc.oc.commons.bukkit.gui.buttons.Button; import tc.oc.commons.bukkit.gui.interfaces.render.ChestRenderInterface; import tc.oc.commons.bukkit.gui.interfaces.render.Coordinate; import tc.oc.commons.bukkit.util.ItemCreator; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.Player; - -import java.util.*; public class GridTextRenderInterface extends ChestRenderInterface { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/HologramUtil.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/HologramUtil.java index 29fc800..b7514f7 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/HologramUtil.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/HologramUtil.java @@ -2,13 +2,12 @@ package tc.oc.commons.bukkit.hologram; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableBiMap; -import org.apache.commons.lang.StringUtils; -import org.bukkit.ChatColor; - -import javax.annotation.Nullable; -import java.awt.*; +import java.awt.Color; import java.awt.image.BufferedImage; import java.util.LinkedList; +import javax.annotation.Nullable; +import org.apache.commons.lang.StringUtils; +import org.bukkit.ChatColor; /** * Various {@link tc.oc.commons.bukkit.hologram.content.HologramFrame}-related utility methods diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/content/HologramFrame.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/content/HologramFrame.java index 9f96dcf..b729d92 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/content/HologramFrame.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/content/HologramFrame.java @@ -1,10 +1,9 @@ package tc.oc.commons.bukkit.hologram.content; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.builder.ToStringBuilder; - import java.util.Arrays; import java.util.List; +import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang.builder.ToStringBuilder; /** * Represents a single frame of a {@link tc.oc.commons.bukkit.hologram.Hologram}. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/AppealAlertListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/AppealAlertListener.java index 0ebe166..51c392a 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/AppealAlertListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/AppealAlertListener.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.listeners; import javax.inject.Inject; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.event.EventHandler; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/InactivePlayerListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/InactivePlayerListener.java index 3c6145c..0c7bd38 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/InactivePlayerListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/InactivePlayerListener.java @@ -1,11 +1,12 @@ package tc.oc.commons.bukkit.listeners; +import java.time.Duration; +import java.time.Instant; import java.util.Map; import java.util.Objects; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.ChatColor; import org.bukkit.Sound; import org.bukkit.configuration.Configuration; @@ -15,8 +16,6 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; -import java.time.Duration; -import java.time.Instant; import tc.oc.commons.bukkit.configuration.ConfigUtils; import tc.oc.commons.bukkit.localization.CommonsTranslations; import tc.oc.commons.bukkit.teleport.PlayerServerChanger; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LocaleListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LocaleListener.java index 73202dd..8ee9d5b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LocaleListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LocaleListener.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.listeners; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LoginListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LoginListener.java index 848d1b7..a8c09a4 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LoginListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LoginListener.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.listeners; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReadWriteLock; @@ -8,12 +10,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; -import org.apache.commons.lang3.mutable.MutableBoolean; import org.bukkit.entity.Player; import org.bukkit.event.EventBus; import org.bukkit.event.EventHandler; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/PermissionGroupListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/PermissionGroupListener.java index 94698fe..6c19533 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/PermissionGroupListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/PermissionGroupListener.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.listeners; +import com.google.common.eventbus.Subscribe; import java.util.Map; import java.util.Objects; import javax.annotation.Nullable; import javax.inject.Inject; - -import com.google.common.eventbus.Subscribe; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizationManifest.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizationManifest.java index 326c034..d84c453 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizationManifest.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizationManifest.java @@ -1,8 +1,7 @@ package tc.oc.commons.bukkit.localization; -import java.util.Map; - import com.google.inject.TypeLiteral; +import java.util.Map; import net.md_5.bungee.api.chat.BaseComponent; import tc.oc.commons.core.inject.Manifest; import tc.oc.commons.core.reflect.TypeLiterals; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedDocument.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedDocument.java index 440aac7..e79299b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedDocument.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedDocument.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.localization; +import com.google.common.cache.LoadingCache; +import com.google.inject.assistedinject.Assisted; import java.io.IOException; import java.nio.file.Path; import java.util.Locale; @@ -9,18 +11,15 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import javax.inject.Inject; import javax.xml.parsers.DocumentBuilder; - -import com.google.common.cache.LoadingCache; -import com.google.inject.assistedinject.Assisted; import org.xml.sax.SAXException; import tc.oc.commons.bukkit.logging.MapdevLogger; -import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.commons.core.localization.Locales; import tc.oc.commons.core.localization.LocalizedFileManager; import tc.oc.commons.core.util.CacheUtils; import tc.oc.file.PathWatcher; import tc.oc.file.PathWatcherHandle; import tc.oc.file.PathWatcherService; +import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.parse.ParseException; import tc.oc.parse.xml.DocumentParser; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java index 0dc8fc6..e46b24c 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java @@ -1,5 +1,9 @@ package tc.oc.commons.bukkit.localization; +import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import com.google.inject.assistedinject.Assisted; import java.nio.file.Path; import java.util.AbstractMap; import java.util.Collection; @@ -7,11 +11,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import javax.inject.Inject; - -import com.google.common.collect.Collections2; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import com.google.inject.assistedinject.Assisted; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.command.CommandSender; import tc.oc.commons.bukkit.chat.ComponentRenderContext; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageMapParser.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageMapParser.java index c7685c3..9fca1af 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageMapParser.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageMapParser.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.localization; import java.util.Map; import javax.inject.Inject; - import net.md_5.bungee.api.chat.BaseComponent; import org.w3c.dom.Document; import tc.oc.commons.bukkit.markup.MarkupParser; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageTemplate.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageTemplate.java index ff76659..70f5793 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageTemplate.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageTemplate.java @@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.localization; import java.text.MessageFormat; import java.util.Locale; import javax.inject.Inject; - import org.bukkit.command.CommandSender; import tc.oc.commons.core.localization.Locales; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginLocales.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginLocales.java index d5ab513..f1e5b79 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginLocales.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginLocales.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.localization; import java.util.Locale; import javax.annotation.Nullable; - import org.bukkit.command.CommandSender; import tc.oc.commons.core.localization.LocaleMatcher; import tc.oc.commons.core.localization.Locales; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginTranslations.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginTranslations.java index fe22cc0..fbf9c79 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginTranslations.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginTranslations.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.localization; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.ImmutableSet; import java.text.MessageFormat; import java.util.Locale; import java.util.NavigableSet; @@ -7,9 +9,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeSet; import javax.annotation.Nullable; - -import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableSet; import org.bukkit.command.CommandSender; import tc.oc.commons.core.localization.Locales; import tc.oc.commons.core.localization.TranslationSet; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/Translations.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/Translations.java index 87e0a55..0210279 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/Translations.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/Translations.java @@ -1,5 +1,7 @@ package tc.oc.commons.bukkit.localization; +import static com.google.common.base.Preconditions.checkState; + import java.util.Collection; import java.util.Iterator; import java.util.Locale; @@ -8,14 +10,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.command.CommandSender; import tc.oc.api.docs.virtual.MapDoc; import tc.oc.commons.core.localization.Locales; import tc.oc.commons.core.localization.TranslationSet; -import static com.google.common.base.Preconditions.checkState; - /** * Contains translations for all plugins. This should be used instead of the * individual plugin classes. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevLogger.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevLogger.java index fbb32b9..63dc420 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevLogger.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevLogger.java @@ -4,7 +4,6 @@ import java.util.Optional; import java.util.logging.Logger; import javax.inject.Inject; import javax.inject.Singleton; - import net.kencochrane.raven.dsn.Dsn; import tc.oc.api.util.Permissions; import tc.oc.commons.core.logging.Loggers; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevSentryConfiguration.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevSentryConfiguration.java index 7d9e070..82c246b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevSentryConfiguration.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevSentryConfiguration.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.logging; import javax.inject.Inject; - import net.kencochrane.raven.dsn.Dsn; import org.bukkit.configuration.Configuration; import org.bukkit.configuration.ConfigurationSection; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/markup/MarkupParser.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/markup/MarkupParser.java index 2bfdf1c..b91117c 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/markup/MarkupParser.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/markup/MarkupParser.java @@ -7,24 +7,23 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Inject; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import org.w3c.dom.Element; import org.w3c.dom.Node; import tc.oc.commons.bukkit.chat.LinkComponent; import tc.oc.commons.bukkit.chat.Links; -import tc.oc.commons.bukkit.chat.UserURI; import tc.oc.commons.bukkit.chat.Renderable; +import tc.oc.commons.bukkit.chat.UserURI; import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.chat.Components; import tc.oc.parse.MissingException; import tc.oc.parse.ParseException; import tc.oc.parse.ValueException; -import tc.oc.parse.xml.XML; import tc.oc.parse.xml.ElementParser; import tc.oc.parse.xml.NodeParser; import tc.oc.parse.xml.UnrecognizedNodeException; +import tc.oc.parse.xml.XML; /** * Parses an XML dialect similar to HTML into {@link BaseComponent}s diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/ConsoleIdentity.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/ConsoleIdentity.java index acdfa90..ff3c9cd 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/ConsoleIdentity.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/ConsoleIdentity.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.nick; import javax.annotation.Nullable; import javax.inject.Singleton; - import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/Identity.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/Identity.java index 070fba7..044a32b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/Identity.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/Identity.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.nick; import javax.annotation.Nullable; - import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.docs.PlayerId; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityImpl.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityImpl.java index 6274b62..ba5ce40 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityImpl.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityImpl.java @@ -1,8 +1,9 @@ package tc.oc.commons.bukkit.nick; +import static com.google.common.base.Preconditions.checkNotNull; + import java.util.Objects; import javax.annotation.Nullable; - import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.bukkit.friends.OnlineFriends; @@ -11,8 +12,6 @@ import tc.oc.api.docs.PlayerId; import tc.oc.api.docs.UserId; import tc.oc.commons.bukkit.util.PlayerStates; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Functionality common to real and nicked identities */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProvider.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProvider.java index 3d8590b..24315c3 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProvider.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProvider.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.nick; import javax.annotation.Nullable; - import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.docs.PlayerId; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProviderImpl.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProviderImpl.java index 2748b22..d55c476 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProviderImpl.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProviderImpl.java @@ -6,7 +6,6 @@ import java.util.Objects; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventBus; @@ -21,11 +20,11 @@ import tc.oc.api.bukkit.users.OnlinePlayers; import tc.oc.api.docs.PlayerId; import tc.oc.api.docs.Session; import tc.oc.api.docs.UserId; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.users.UserSearchResponse; import tc.oc.commons.bukkit.event.UserLoginEvent; import tc.oc.commons.bukkit.util.PlayerStates; import tc.oc.commons.core.plugin.PluginFacet; +import tc.oc.minecraft.scheduler.SyncExecutor; @Singleton public class IdentityProviderImpl implements IdentityProvider, Listener, PluginFacet { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameCommands.java index e0b0ce7..69f9eac 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameCommands.java @@ -1,13 +1,5 @@ package tc.oc.commons.bukkit.nick; -import java.time.Duration; -import java.time.Instant; -import java.util.Objects; -import java.util.stream.Stream; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.base.Function; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -15,6 +7,13 @@ import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; +import java.time.Duration; +import java.time.Instant; +import java.util.Objects; +import java.util.stream.Stream; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; @@ -35,9 +34,6 @@ import tc.oc.api.docs.PlayerId; import tc.oc.api.docs.User; import tc.oc.api.docs.virtual.UserDoc; import tc.oc.api.exceptions.UnprocessableEntity; -import tc.oc.commons.core.commands.TranslatableCommandException; -import tc.oc.commons.core.formatting.PeriodFormats; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.users.UserService; import tc.oc.commons.bukkit.chat.Audiences; import tc.oc.commons.bukkit.chat.NameStyle; @@ -52,6 +48,9 @@ import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.ComponentCommandException; +import tc.oc.commons.core.commands.TranslatableCommandException; +import tc.oc.commons.core.formatting.PeriodFormats; +import tc.oc.minecraft.scheduler.SyncExecutor; @Singleton public class NicknameCommands implements Listener, Commands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameConfiguration.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameConfiguration.java index d329db4..fe66bac 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameConfiguration.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameConfiguration.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.nick; -import javax.inject.Inject; +import static com.google.common.base.Preconditions.checkNotNull; +import javax.inject.Inject; import org.bukkit.configuration.Configuration; import org.bukkit.configuration.ConfigurationSection; -import static com.google.common.base.Preconditions.checkNotNull; - public class NicknameConfiguration { private final ConfigurationSection config; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceChanger.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceChanger.java index 7970de1..07f1828 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceChanger.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceChanger.java @@ -1,26 +1,24 @@ package tc.oc.commons.bukkit.nick; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import org.bukkit.Skin; import org.bukkit.entity.Player; import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; -import tc.oc.commons.bukkit.flairs.FlairConfiguration; -import tc.oc.commons.bukkit.flairs.FlairRenderer; import tc.oc.commons.bukkit.chat.FullNameRenderer; import tc.oc.commons.bukkit.chat.NameStyle; import tc.oc.commons.bukkit.chat.NameType; +import tc.oc.commons.bukkit.flairs.FlairConfiguration; +import tc.oc.commons.bukkit.flairs.FlairRenderer; import tc.oc.commons.core.scheduler.Scheduler; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - /** * Manages the Bukkit aspects of a player's name and appearance */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceListener.java index 17ed254..31e49b5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceListener.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.nick; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerIdentityChangeEvent.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerIdentityChangeEvent.java index 235ddcc..39ea947 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerIdentityChangeEvent.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerIdentityChangeEvent.java @@ -1,11 +1,11 @@ package tc.oc.commons.bukkit.nick; +import static com.google.common.base.Preconditions.checkNotNull; + import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Fired when a player changes/clears their nickname immediately during a session, * i.e. with "/nick -i". This is NEVER fired on login or logout. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrder.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrder.java index 4814a1d..aae08f2 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrder.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrder.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.nick; import java.util.Comparator; import java.util.function.Function; - import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrderCache.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrderCache.java index 5d5c96b..8cd540d 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrderCache.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrderCache.java @@ -1,20 +1,19 @@ package tc.oc.commons.bukkit.nick; -import java.lang.ref.WeakReference; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.cache.LoadingCache; import com.google.common.collect.ComparisonChain; import com.google.common.eventbus.Subscribe; +import java.lang.ref.WeakReference; +import javax.inject.Inject; +import javax.inject.Singleton; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerQuitEvent; -import tc.oc.api.minecraft.servers.LocalServerReconfigureEvent; import tc.oc.api.bukkit.users.BukkitUserStore; import tc.oc.api.minecraft.MinecraftService; +import tc.oc.api.minecraft.servers.LocalServerReconfigureEvent; import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.commons.core.util.CacheUtils; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/UsernameRenderer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/UsernameRenderer.java index bf7fc34..9fa1127 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/UsernameRenderer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/UsernameRenderer.java @@ -3,15 +3,14 @@ package tc.oc.commons.bukkit.nick; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TranslatableComponent; import tc.oc.commons.bukkit.chat.NameFlag; -import tc.oc.commons.bukkit.chat.PartialNameRenderer; import tc.oc.commons.bukkit.chat.NameType; +import tc.oc.commons.bukkit.chat.PartialNameRenderer; import tc.oc.commons.core.chat.Component; @Singleton diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java index 4562b17..a727c95 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java @@ -1,16 +1,25 @@ package tc.oc.commons.bukkit.punishment; -import java.time.Duration; -import java.util.List; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; +import static tc.oc.api.docs.virtual.PunishmentDoc.Type; +import static tc.oc.api.docs.virtual.PunishmentDoc.Type.BAN; +import static tc.oc.api.docs.virtual.PunishmentDoc.Type.KICK; +import static tc.oc.api.docs.virtual.PunishmentDoc.Type.WARN; +import static tc.oc.commons.bukkit.commands.UserFinder.Default.NULL; +import static tc.oc.commons.bukkit.commands.UserFinder.Default.SENDER; +import static tc.oc.commons.bukkit.commands.UserFinder.Scope; +import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromFlag; +import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromType; import com.google.common.collect.Collections2; import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissionsException; +import java.time.Duration; +import java.util.List; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; @@ -30,14 +39,6 @@ import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.concurrent.Flexecutor; import tc.oc.minecraft.scheduler.Sync; -import static tc.oc.api.docs.virtual.PunishmentDoc.Type; -import static tc.oc.api.docs.virtual.PunishmentDoc.Type.*; -import static tc.oc.commons.bukkit.commands.UserFinder.Default.NULL; -import static tc.oc.commons.bukkit.commands.UserFinder.Default.SENDER; -import static tc.oc.commons.bukkit.commands.UserFinder.Scope; -import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromFlag; -import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromType; - @Singleton public class PunishmentCommands implements Commands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCreator.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCreator.java index 1090286..8456cbc 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCreator.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCreator.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.punishment; +import com.google.common.util.concurrent.ListenableFuture; import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.util.concurrent.ListenableFuture; import tc.oc.api.docs.PlayerId; import tc.oc.api.docs.Punishment; import tc.oc.api.docs.Server; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java index a0b2733..72de15b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java @@ -1,8 +1,11 @@ package tc.oc.commons.bukkit.punishment; +import static tc.oc.commons.bukkit.punishment.PunishmentMessageSetting.Options; +import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP; +import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP_STALE; + import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.Sound; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -26,10 +29,6 @@ import tc.oc.commons.core.concurrent.Flexecutor; import tc.oc.minecraft.api.event.Enableable; import tc.oc.minecraft.scheduler.Sync; -import static tc.oc.commons.bukkit.punishment.PunishmentMessageSetting.Options; -import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP; -import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP_STALE; - @Singleton public class PunishmentEnforcer implements Enableable, MessageListener { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentFormatter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentFormatter.java index 2d3ccd3..8f59b3a 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentFormatter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentFormatter.java @@ -1,10 +1,9 @@ package tc.oc.commons.bukkit.punishment; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; - -import com.google.common.collect.ImmutableList; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentMessageSetting.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentMessageSetting.java index f3e5152..578c09b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentMessageSetting.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentMessageSetting.java @@ -4,8 +4,6 @@ import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingBuilder; import me.anxuiz.settings.types.EnumType; import me.anxuiz.settings.types.Name; -import org.bukkit.Material; -import tc.oc.commons.bukkit.util.ItemCreator; public class PunishmentMessageSetting { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentPermissions.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentPermissions.java index 54e84e8..39ca028 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentPermissions.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentPermissions.java @@ -1,8 +1,7 @@ package tc.oc.commons.bukkit.punishment; -import tc.oc.api.docs.virtual.PunishmentDoc; - import javax.annotation.Nullable; +import tc.oc.api.docs.virtual.PunishmentDoc; public interface PunishmentPermissions { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropCommands.java index 1f30802..147498d 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropCommands.java @@ -1,15 +1,13 @@ package tc.oc.commons.bukkit.raindrops; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.commons.bukkit.chat.Audiences; import tc.oc.commons.bukkit.chat.PlayerComponent; import tc.oc.commons.bukkit.commands.UserFinder; @@ -17,6 +15,7 @@ import tc.oc.commons.bukkit.nick.IdentityProvider; import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; +import tc.oc.minecraft.scheduler.SyncExecutor; /** * General raindrop related commands diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropManifest.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropManifest.java index 3ca95fe..e9bd274 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropManifest.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropManifest.java @@ -1,8 +1,8 @@ package tc.oc.commons.bukkit.raindrops; import org.bukkit.permissions.Permission; -import org.bukkit.permissions.PermissionDefault; import org.bukkit.permissions.PermissionBinder; +import org.bukkit.permissions.PermissionDefault; import tc.oc.commons.core.inject.HybridManifest; import tc.oc.commons.core.plugin.PluginFacetBinder; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropUtil.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropUtil.java index ee36068..29bb36b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropUtil.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/raindrops/RaindropUtil.java @@ -1,8 +1,8 @@ package tc.oc.commons.bukkit.raindrops; +import java.time.Duration; import javax.annotation.Nullable; import javax.inject.Inject; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Material; @@ -11,7 +11,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventBus; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.Plugin; -import java.time.Duration; import tc.oc.api.bukkit.users.BukkitUserStore; import tc.oc.api.docs.PlayerId; import tc.oc.api.users.CreditTokensRequest; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportAnnouncer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportAnnouncer.java index 9fc82d1..a133ff3 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportAnnouncer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportAnnouncer.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.report; import javax.inject.Inject; import javax.inject.Singleton; - import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingBuilder; import me.anxuiz.settings.types.BooleanType; @@ -13,10 +12,8 @@ import tc.oc.api.message.MessageListener; import tc.oc.api.message.MessageQueue; import tc.oc.api.message.types.ModelUpdate; import tc.oc.api.servers.ServerStore; -import tc.oc.commons.bukkit.channels.admin.AdminChannel; import tc.oc.commons.bukkit.chat.Audiences; import tc.oc.commons.bukkit.chat.BukkitSound; -import tc.oc.commons.bukkit.settings.SettingManagerProvider; import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.minecraft.scheduler.MainThreadExecutor; @@ -62,7 +59,11 @@ public class ReportAnnouncer implements PluginFacet, MessageListener { @HandleMessage public void broadcast(ModelUpdate message) { - if(serverStore.canCommunicate(localServer._id(), message.document().server_id())) { + if (!config.cross_server() && !localServer._id().equals(message.document().server_id())) { + return; + } + + if(serverStore.canCommunicate(localServer._id(), message.document().server_id()) && config.families().contains(message.document().family())) { audiences.permission(ReportPermissions.RECEIVE) .sendMessages(reportFormatter.format(message.document(), true, false)); } diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCommands.java index b94431e..a21dab2 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCommands.java @@ -1,28 +1,25 @@ package tc.oc.commons.bukkit.report; -import java.util.Map; -import java.util.WeakHashMap; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; +import java.time.Duration; +import java.time.Instant; +import java.util.Map; +import java.util.WeakHashMap; +import javax.inject.Inject; +import javax.inject.Singleton; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import java.time.Duration; -import java.time.Instant; - import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerQuitEvent; import tc.oc.api.bukkit.users.BukkitUserStore; import tc.oc.api.docs.Report; import tc.oc.api.docs.Server; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.model.QueryService; import tc.oc.api.reports.ReportSearchRequest; import tc.oc.commons.bukkit.chat.Audiences; @@ -39,6 +36,7 @@ import tc.oc.commons.core.commands.TranslatableCommandException; import tc.oc.commons.core.formatting.PeriodFormats; import tc.oc.commons.core.util.Comparables; import tc.oc.minecraft.api.event.Listener; +import tc.oc.minecraft.scheduler.SyncExecutor; @Singleton public class ReportCommands implements Commands, Listener { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportConfiguration.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportConfiguration.java index 702b3ab..f111997 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportConfiguration.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportConfiguration.java @@ -1,9 +1,9 @@ package tc.oc.commons.bukkit.report; -import javax.inject.Inject; - -import org.bukkit.configuration.Configuration; import java.time.Duration; +import java.util.List; +import javax.inject.Inject; +import org.bukkit.configuration.Configuration; import tc.oc.commons.bukkit.configuration.ConfigUtils; public class ReportConfiguration { @@ -21,4 +21,12 @@ public class ReportConfiguration { public Duration cooldown() { return ConfigUtils.getDuration(config, "reports.cooldown", Duration.ZERO); } + + public List families() { + return config.getStringList("reports.families"); + } + + public boolean cross_server() { + return config.getBoolean("reports.cross-server", false); + } } diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCreator.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCreator.java index 8047b43..07d005c 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCreator.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportCreator.java @@ -1,13 +1,12 @@ package tc.oc.commons.bukkit.report; +import com.google.common.util.concurrent.ListenableFuture; import java.util.EnumSet; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.util.concurrent.ListenableFuture; import org.bukkit.GameMode; import org.bukkit.entity.Player; import tc.oc.api.bukkit.users.BukkitUserStore; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportFormatter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportFormatter.java index eef3993..5910ec0 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportFormatter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/report/ReportFormatter.java @@ -1,10 +1,9 @@ package tc.oc.commons.bukkit.report; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; - -import com.google.common.collect.ImmutableList; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import tc.oc.api.docs.Report; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackCommands.java index 65b835f..312df36 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackCommands.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.respack; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.NestedCommand; +import javax.inject.Inject; import org.bukkit.command.CommandSender; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.NestedCommands; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackListener.java index 934ff38..b844a8d 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackListener.java @@ -1,5 +1,6 @@ package tc.oc.commons.bukkit.respack; +import com.google.common.eventbus.Subscribe; import java.time.Duration; import java.time.Instant; import java.util.Objects; @@ -7,8 +8,6 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.eventbus.Subscribe; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackManager.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackManager.java index 784e2c0..f16ed23 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackManager.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/respack/ResourcePackManager.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.respack; import javax.annotation.Nullable; - import org.bukkit.entity.Player; public interface ResourcePackManager { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/restart/RestartCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/restart/RestartCommands.java index c2f5cb7..c01414b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/restart/RestartCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/restart/RestartCommands.java @@ -1,16 +1,14 @@ package tc.oc.commons.bukkit.restart; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.CommandPermissionsException; import com.sk89q.minecraft.util.commands.Console; +import javax.inject.Inject; import net.md_5.bungee.api.chat.TranslatableComponent; import tc.oc.api.docs.virtual.ServerDoc; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.commons.core.chat.Audience; import tc.oc.commons.core.chat.Audiences; import tc.oc.commons.core.commands.CommandFutureCallback; @@ -18,6 +16,7 @@ import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.TranslatableCommandException; import tc.oc.commons.core.restart.RestartManager; import tc.oc.minecraft.api.command.CommandSender; +import tc.oc.minecraft.scheduler.SyncExecutor; public class RestartCommands implements Commands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/sessions/SessionListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/sessions/SessionListener.java index 33d158d..41f53e5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/sessions/SessionListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/sessions/SessionListener.java @@ -6,7 +6,6 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -17,8 +16,6 @@ import tc.oc.api.bukkit.users.BukkitUserStore; import tc.oc.api.bukkit.users.OnlinePlayers; import tc.oc.api.docs.Server; import tc.oc.api.docs.Session; -import tc.oc.minecraft.protocol.MinecraftVersion; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.sessions.SessionService; import tc.oc.api.sessions.SessionStartRequest; import tc.oc.commons.bukkit.event.UserLoginEvent; @@ -26,6 +23,8 @@ import tc.oc.commons.bukkit.nick.PlayerIdentityChangeEvent; import tc.oc.commons.core.logging.Loggers; import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.commons.core.util.SystemFutureCallback; +import tc.oc.minecraft.protocol.MinecraftVersion; +import tc.oc.minecraft.scheduler.SyncExecutor; /** * Adds login sessions to the local cache diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/RemoteTeleport.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/RemoteTeleport.java index ddae76e..ed0076b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/RemoteTeleport.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/RemoteTeleport.java @@ -3,8 +3,6 @@ package tc.oc.commons.bukkit.settings; import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingBuilder; import me.anxuiz.settings.types.BooleanType; -import org.bukkit.Material; -import tc.oc.commons.bukkit.util.ItemCreator; /** * TODO: Not implemented yet diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProvider.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProvider.java index c833696..b1cb7f5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProvider.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProvider.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.settings; +import java.util.Optional; import me.anxuiz.settings.SettingManager; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.docs.User; -import java.util.Optional; - /** * Provides access to player settings for both online and offline players */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProviderImpl.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProviderImpl.java index f296797..7e48732 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProviderImpl.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/settings/SettingManagerProviderImpl.java @@ -1,5 +1,6 @@ package tc.oc.commons.bukkit.settings; +import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -7,8 +8,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.collect.ImmutableMap; import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingCallback; import me.anxuiz.settings.SettingCallbackManager; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsCommands.java index eaeaa66..a6d35ab 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsCommands.java @@ -4,6 +4,8 @@ import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; +import java.util.HashMap; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import org.bukkit.command.CommandSender; import tc.oc.commons.bukkit.chat.Audiences; @@ -18,9 +20,6 @@ import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.minecraft.scheduler.SyncExecutor; -import javax.inject.Inject; -import java.util.HashMap; - public class StatsCommands implements Commands { private final SyncExecutor syncExecutor; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsUtil.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsUtil.java index 593fdbc..457fc84 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsUtil.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/stats/StatsUtil.java @@ -1,13 +1,12 @@ package tc.oc.commons.bukkit.stats; +import java.util.HashMap; +import java.util.Map; +import javax.inject.Inject; import org.bukkit.entity.Player; import tc.oc.api.bukkit.users.BukkitUserStore; import tc.oc.api.docs.User; -import javax.inject.Inject; -import java.util.HashMap; -import java.util.Map; - public class StatsUtil { @Inject diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/DynamicTabEntry.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/DynamicTabEntry.java index 9005976..7219162 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/DynamicTabEntry.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/DynamicTabEntry.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.tablist; import com.google.common.collect.Iterables; - import java.util.HashSet; import java.util.Set; import java.util.UUID; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/PlayerTabEntry.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/PlayerTabEntry.java index 0980189..0fd3846 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/PlayerTabEntry.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/PlayerTabEntry.java @@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.tablist; import java.util.UUID; import javax.annotation.Nullable; import javax.inject.Inject; - import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Skin; import org.bukkit.entity.Player; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/SimpleTabEntry.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/SimpleTabEntry.java index 9fbcb48..3c3c786 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/SimpleTabEntry.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/SimpleTabEntry.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.tablist; +import java.util.UUID; +import javax.annotation.Nullable; import org.bukkit.GameMode; import org.bukkit.Skin; import org.bukkit.entity.Player; -import javax.annotation.Nullable; -import java.util.UUID; - /** * Implements part of {@link TabEntry} with a few generally useful properties */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabEntry.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabEntry.java index 5a42965..eeea63c 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabEntry.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabEntry.java @@ -1,13 +1,12 @@ package tc.oc.commons.bukkit.tablist; +import java.util.UUID; +import javax.annotation.Nullable; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.GameMode; import org.bukkit.Skin; import org.bukkit.entity.Player; -import javax.annotation.Nullable; -import java.util.UUID; - /** * Content for a slot in a {@link TabView} */ diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabManager.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabManager.java index d6098e8..0e209b2 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabManager.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabManager.java @@ -1,5 +1,8 @@ package tc.oc.commons.bukkit.tablist; +import java.util.Map; +import java.util.logging.Logger; +import javax.annotation.Nullable; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -14,10 +17,6 @@ import tc.oc.commons.core.logging.ClassLogger; import tc.oc.commons.core.util.DefaultMapAdapter; import tc.oc.commons.core.util.DefaultProvider; -import javax.annotation.Nullable; -import java.util.Map; -import java.util.logging.Logger; - /** * Custom player list display (for 1.8 and later) * diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabRender.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabRender.java index 7096629..bfc2bf6 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabRender.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabRender.java @@ -1,11 +1,13 @@ package tc.oc.commons.bukkit.tablist; +import static tc.oc.minecraft.protocol.MinecraftVersion.MINECRAFT_1_8; +import static tc.oc.minecraft.protocol.MinecraftVersion.atLeast; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; import javax.inject.Inject; - import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.server.Packet; import net.minecraft.server.PacketPlayOutPlayerInfo; @@ -14,9 +16,6 @@ import org.bukkit.entity.Player; import tc.oc.commons.bukkit.chat.ComponentRenderContext; import tc.oc.commons.bukkit.util.NMSHacks; -import static tc.oc.minecraft.protocol.MinecraftVersion.atLeast; -import static tc.oc.minecraft.protocol.MinecraftVersion.MINECRAFT_1_8; - public class TabRender { @Inject private static ComponentRenderContext componentRenderContext; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabView.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabView.java index 828a4a7..72fa4c0 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabView.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tablist/TabView.java @@ -2,15 +2,13 @@ package tc.oc.commons.bukkit.tablist; import java.util.HashMap; import java.util.Map; - +import javax.annotation.Nullable; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.scheduler.BukkitTask; import tc.oc.commons.core.util.DefaultProvider; -import javax.annotation.Nullable; - /** * A single player's tab list. When this view is enabled, it creates a scoreboard team for * each slot and creates an entry for each team. The team names are used to order the list. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/FeaturedServerTracker.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/FeaturedServerTracker.java index cbdfcf3..8db4700 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/FeaturedServerTracker.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/FeaturedServerTracker.java @@ -1,12 +1,13 @@ package tc.oc.commons.bukkit.teleport; +import static java.util.Comparator.comparing; + import java.util.Comparator; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.configuration.Configuration; import tc.oc.api.docs.Server; import tc.oc.api.docs.virtual.ServerDoc; @@ -15,8 +16,6 @@ import tc.oc.api.model.ModelListener; import tc.oc.api.servers.ServerStore; import tc.oc.commons.core.plugin.PluginFacet; -import static java.util.Comparator.comparing; - @Singleton public class FeaturedServerTracker implements PluginFacet, ModelListener { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Navigator.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Navigator.java index ce291a4..be6bee4 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Navigator.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Navigator.java @@ -1,5 +1,12 @@ package tc.oc.commons.bukkit.teleport; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.ImmutableList; +import com.google.inject.Singleton; +import com.sk89q.minecraft.util.commands.Command; +import com.sk89q.minecraft.util.commands.CommandContext; +import com.sk89q.minecraft.util.commands.CommandException; +import com.sk89q.minecraft.util.commands.CommandPermissions; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -10,14 +17,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.inject.Inject; - -import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableList; -import com.google.inject.Singleton; -import com.sk89q.minecraft.util.commands.Command; -import com.sk89q.minecraft.util.commands.CommandContext; -import com.sk89q.minecraft.util.commands.CommandException; -import com.sk89q.minecraft.util.commands.CommandPermissions; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/NavigatorInterface.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/NavigatorInterface.java index 3a4b3f7..cc238f5 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/NavigatorInterface.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/NavigatorInterface.java @@ -1,5 +1,13 @@ package tc.oc.commons.bukkit.teleport; +import static tc.oc.commons.core.exception.LambdaExceptionUtils.rethrowFunction; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.sk89q.minecraft.util.commands.Command; +import com.sk89q.minecraft.util.commands.CommandContext; +import com.sk89q.minecraft.util.commands.CommandException; +import com.sk89q.minecraft.util.commands.CommandPermissions; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -10,13 +18,6 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.sk89q.minecraft.util.commands.Command; -import com.sk89q.minecraft.util.commands.CommandContext; -import com.sk89q.minecraft.util.commands.CommandException; -import com.sk89q.minecraft.util.commands.CommandPermissions; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; @@ -61,8 +62,6 @@ import tc.oc.commons.core.inject.InnerFactory; import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.minecraft.api.configuration.InvalidConfigurationException; -import static tc.oc.commons.core.exception.LambdaExceptionUtils.rethrowFunction; - @Singleton public class NavigatorInterface implements PluginFacet, Listener, Commands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/PlayerServerChanger.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/PlayerServerChanger.java index acaef29..bf5b593 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/PlayerServerChanger.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/PlayerServerChanger.java @@ -1,14 +1,13 @@ package tc.oc.commons.bukkit.teleport; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.SettableFuture; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; import javax.annotation.Nullable; import javax.inject.Inject; - -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.SettableFuture; import net.md_5.bungee.api.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportCommands.java index 041de6f..23ac12e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportCommands.java @@ -1,14 +1,12 @@ package tc.oc.commons.bukkit.teleport; -import javax.inject.Inject; - import com.google.common.util.concurrent.ListenableFuture; import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; +import javax.inject.Inject; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.users.UserSearchResponse; import tc.oc.commons.bukkit.chat.NameStyle; import tc.oc.commons.bukkit.chat.PlayerComponent; @@ -18,6 +16,7 @@ import tc.oc.commons.bukkit.nick.IdentityProvider; import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.TranslatableCommandException; +import tc.oc.minecraft.scheduler.SyncExecutor; public class TeleportCommands implements Commands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportListener.java index 5bfc050..385feb8 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/TeleportListener.java @@ -8,7 +8,6 @@ import java.util.UUID; import java.util.logging.Logger; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Teleporter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Teleporter.java index 59ff40e..c3a9534 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Teleporter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/teleport/Teleporter.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.teleport; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.util.UUID; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketBooth.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketBooth.java index b97ebeb..29d4683 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketBooth.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketBooth.java @@ -1,5 +1,8 @@ package tc.oc.commons.bukkit.ticket; +import com.google.common.collect.Sets; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.util.Comparator; import java.util.Objects; import java.util.Optional; @@ -7,10 +10,6 @@ import java.util.Set; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.collect.Sets; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -28,7 +27,6 @@ import tc.oc.api.games.TicketService; import tc.oc.api.games.TicketStore; import tc.oc.api.message.types.PlayGameRequest; import tc.oc.api.message.types.Reply; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.servers.ServerStore; import tc.oc.commons.bukkit.chat.Audiences; import tc.oc.commons.bukkit.chat.WarningComponent; @@ -37,6 +35,7 @@ import tc.oc.commons.bukkit.teleport.PlayerServerChanger; import tc.oc.commons.bukkit.util.PlayerStates; import tc.oc.commons.core.chat.Audience; import tc.oc.commons.core.commands.CommandFutureCallback; +import tc.oc.minecraft.scheduler.SyncExecutor; /** * User actions for querying, joining, and leaving {@link Game}s diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketCommands.java index 8752d63..cc13ebd 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketCommands.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.ticket; -import java.util.List; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; +import java.util.List; +import javax.inject.Inject; import org.bukkit.command.CommandSender; import tc.oc.api.docs.Game; import tc.oc.commons.bukkit.commands.CommandUtils; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketDisplay.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketDisplay.java index 36f30a5..1306e4d 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketDisplay.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketDisplay.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.ticket; +import com.google.common.cache.LoadingCache; import java.time.Duration; import java.util.Collections; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.cache.LoadingCache; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarStyle; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketListener.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketListener.java index c7c1bbf..fa0e46b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketListener.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/ticket/TicketListener.java @@ -5,7 +5,6 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; - import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenCommands.java index e3d4fa3..6c3a9f2 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenCommands.java @@ -1,6 +1,11 @@ package tc.oc.commons.bukkit.tokens; -import com.sk89q.minecraft.util.commands.*; +import com.sk89q.minecraft.util.commands.Command; +import com.sk89q.minecraft.util.commands.CommandContext; +import com.sk89q.minecraft.util.commands.CommandException; +import com.sk89q.minecraft.util.commands.CommandPermissions; +import com.sk89q.minecraft.util.commands.CommandUsageException; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; @@ -15,8 +20,6 @@ import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.minecraft.scheduler.SyncExecutor; -import javax.inject.Inject; - public class TokenCommands implements Commands { private final UserFinder userFinder; private final SyncExecutor executor; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenUtil.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenUtil.java index e1b81c5..df535db 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenUtil.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/tokens/TokenUtil.java @@ -1,14 +1,13 @@ package tc.oc.commons.bukkit.tokens; +import javax.inject.Inject; import org.bukkit.entity.Player; import tc.oc.api.bukkit.users.BukkitUserStore; import tc.oc.api.docs.PlayerId; +import tc.oc.api.docs.User; import tc.oc.api.users.CreditTokensRequest; import tc.oc.api.users.UserService; import tc.oc.commons.bukkit.util.SyncPlayerExecutorFactory; -import tc.oc.api.docs.User; - -import javax.inject.Inject; public class TokenUtil { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCase.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCase.java index ee6d73d..b88958f 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCase.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCase.java @@ -1,11 +1,14 @@ package tc.oc.commons.bukkit.trophies; +import static com.google.common.util.concurrent.Futures.immediateFuture; +import static tc.oc.commons.core.concurrent.FutureUtils.mapAsync; +import static tc.oc.commons.core.concurrent.FutureUtils.mapSync; + +import com.google.common.util.concurrent.ListenableFuture; import java.util.List; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.util.concurrent.ListenableFuture; import org.bukkit.entity.Player; import org.bukkit.event.EventBus; import tc.oc.api.bukkit.users.BukkitUserStore; @@ -13,15 +16,11 @@ import tc.oc.api.docs.Trophy; import tc.oc.api.docs.User; import tc.oc.api.docs.UserId; import tc.oc.api.docs.virtual.UserDoc; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.api.trophies.TrophyStore; import tc.oc.api.users.UserService; import tc.oc.commons.core.stream.Collectors; import tc.oc.commons.core.util.Streams; - -import static com.google.common.util.concurrent.Futures.immediateFuture; -import static tc.oc.commons.core.concurrent.FutureUtils.mapAsync; -import static tc.oc.commons.core.concurrent.FutureUtils.mapSync; +import tc.oc.minecraft.scheduler.SyncExecutor; /** * Handles listing, granting, and revoking of {@link Trophy}s from {@link User}s. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCommands.java index c6b8135..c4239c1 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/trophies/TrophyCommands.java @@ -1,7 +1,5 @@ package tc.oc.commons.bukkit.trophies; -import javax.inject.Inject; - import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -10,6 +8,7 @@ import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.NestedCommand; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TranslatableComponent; @@ -24,12 +23,12 @@ import tc.oc.commons.bukkit.chat.WarningComponent; import tc.oc.commons.bukkit.commands.UserFinder; import tc.oc.commons.bukkit.nick.Identity; import tc.oc.commons.bukkit.nick.IdentityProvider; -import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.NestedCommands; import tc.oc.commons.core.commands.TranslatableCommandException; +import tc.oc.minecraft.scheduler.MainThreadExecutor; public class TrophyCommands implements NestedCommands { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageAnnouncer.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageAnnouncer.java index 6f0be8a..a808401 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageAnnouncer.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageAnnouncer.java @@ -1,12 +1,16 @@ package tc.oc.commons.bukkit.users; +import static com.google.common.base.Preconditions.checkArgument; +import static tc.oc.commons.core.IterableUtils.none; +import static tc.oc.commons.core.util.Nullables.first; +import static tc.oc.commons.core.util.Utils.notEqual; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; import javax.annotation.Nullable; import javax.inject.Inject; - -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; import me.anxuiz.settings.Setting; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; @@ -47,11 +51,6 @@ import tc.oc.commons.core.plugin.PluginFacet; import tc.oc.commons.core.util.Lazy; import tc.oc.minecraft.scheduler.SyncExecutor; -import static com.google.common.base.Preconditions.checkArgument; -import static tc.oc.commons.core.IterableUtils.none; -import static tc.oc.commons.core.util.Nullables.first; -import static tc.oc.commons.core.util.Utils.notEqual; - /** * Receives {@link SessionChange} messages from the topic exchange and generates * connect/disconnect/change server announcements. ALL announcements are generated diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageConfiguration.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageConfiguration.java index 5f4fe35..781773b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageConfiguration.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageConfiguration.java @@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.users; import java.util.function.Predicate; import javax.inject.Inject; - import tc.oc.commons.core.configuration.ConfigUtils; import tc.oc.commons.core.util.Predicates; import tc.oc.minecraft.api.configuration.Configuration; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageSetting.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageSetting.java index 800fbb5..bfd387e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageSetting.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/JoinMessageSetting.java @@ -4,9 +4,7 @@ import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingBuilder; import me.anxuiz.settings.types.EnumType; import me.anxuiz.settings.types.Name; -import org.bukkit.Material; import tc.oc.commons.bukkit.nick.Familiarity; -import tc.oc.commons.bukkit.util.ItemCreator; public class JoinMessageSetting { private static final Setting inst = new SettingBuilder() diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/PlayerSearchResponse.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/PlayerSearchResponse.java index 6062b4f..adb6c22 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/PlayerSearchResponse.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/users/PlayerSearchResponse.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.users; import javax.annotation.Nullable; - import org.bukkit.entity.Player; import tc.oc.api.users.UserSearchResponse; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/ItemCreator.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/ItemCreator.java index 9121e2b..c211775 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/ItemCreator.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/ItemCreator.java @@ -1,5 +1,11 @@ package tc.oc.commons.bukkit.util; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.server.NBTTagCompound; import org.bukkit.Color; import org.bukkit.Material; @@ -11,8 +17,6 @@ import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffect; -import java.util.*; - public class ItemCreator { private Material material; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PermissionUtils.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PermissionUtils.java index e19ddee..04a11d3 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PermissionUtils.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PermissionUtils.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.util; import java.util.Map; - import org.bukkit.permissions.Permissible; import org.bukkit.permissions.PermissionAttachment; import tc.oc.api.util.Permissions; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStates.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStates.java index c5a0c5f..9d043b8 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStates.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStates.java @@ -1,10 +1,9 @@ package tc.oc.commons.bukkit.util; +import javax.annotation.Nullable; import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; -import javax.annotation.Nullable; - /** * Mechanism for retrieving basic state data about a match player * from a {@link Player}. All values are set by PGM using {@link MetadataValue}s. diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStatesImpl.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStatesImpl.java index b188271..7cf2ec0 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStatesImpl.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/PlayerStatesImpl.java @@ -1,15 +1,14 @@ package tc.oc.commons.bukkit.util; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; import org.bukkit.GameMode; import org.bukkit.entity.Player; import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; - @Singleton public class PlayerStatesImpl implements PlayerStates { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/SyncPlayerExecutorFactory.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/SyncPlayerExecutorFactory.java index 1701ae7..59f2f79 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/SyncPlayerExecutorFactory.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/util/SyncPlayerExecutorFactory.java @@ -3,16 +3,15 @@ package tc.oc.commons.bukkit.util; import java.util.UUID; import java.util.concurrent.Executor; import javax.inject.Inject; - import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.bukkit.users.OnlinePlayers; import tc.oc.api.docs.SimpleUserId; import tc.oc.api.docs.UserId; -import tc.oc.minecraft.scheduler.SyncExecutor; -import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.commons.core.concurrent.ContextualExecutor; import tc.oc.commons.core.concurrent.ContextualExecutorImpl; +import tc.oc.minecraft.scheduler.MainThreadExecutor; +import tc.oc.minecraft.scheduler.SyncExecutor; /** * Creates {@link ContextualExecutor}s for {@link Player}s that will only execute diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperCommands.java index 3a62095..db05eeb 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperCommands.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.whisper; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; +import javax.inject.Inject; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import tc.oc.api.bukkit.users.BukkitUserStore; @@ -18,10 +17,10 @@ import tc.oc.commons.bukkit.commands.CommandUtils; import tc.oc.commons.bukkit.commands.UserFinder; import tc.oc.commons.bukkit.nick.Identity; import tc.oc.commons.bukkit.nick.IdentityProvider; -import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.commons.core.chat.Audience; import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; +import tc.oc.minecraft.scheduler.MainThreadExecutor; public class WhisperCommands implements Commands { private final BukkitUserStore userStore; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperDispatcher.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperDispatcher.java index 13a8529..4f6a3b1 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperDispatcher.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperDispatcher.java @@ -1,12 +1,11 @@ package tc.oc.commons.bukkit.whisper; +import com.google.common.collect.Lists; +import com.google.common.util.concurrent.ListenableFuture; import java.time.Duration; import java.time.Instant; import java.util.List; import javax.inject.Inject; - -import com.google.common.collect.Lists; -import com.google.common.util.concurrent.ListenableFuture; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperFormatter.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperFormatter.java index 1713a13..383796b 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperFormatter.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperFormatter.java @@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.whisper; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; - import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.Sound; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperManifest.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperManifest.java index 38bd52d..d3b43a1 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperManifest.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperManifest.java @@ -1,7 +1,6 @@ package tc.oc.commons.bukkit.whisper; import javax.inject.Singleton; - import tc.oc.commons.bukkit.settings.SettingBinder; import tc.oc.commons.core.inject.HybridManifest; import tc.oc.commons.core.plugin.PluginFacetBinder; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperSettings.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperSettings.java index 7ac388b..0ada128 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperSettings.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperSettings.java @@ -4,11 +4,9 @@ import me.anxuiz.settings.Setting; import me.anxuiz.settings.SettingBuilder; import me.anxuiz.settings.types.EnumType; import me.anxuiz.settings.types.Name; -import org.bukkit.Material; import org.bukkit.command.CommandSender; import tc.oc.commons.bukkit.nick.Familiarity; import tc.oc.commons.bukkit.nick.Identity; -import tc.oc.commons.bukkit.util.ItemCreator; public class WhisperSettings { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/Whitelist.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/Whitelist.java index 1118ee1..4028c9e 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/Whitelist.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/Whitelist.java @@ -1,11 +1,10 @@ package tc.oc.commons.bukkit.whitelist; +import com.google.common.collect.ForwardingSet; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; - -import com.google.common.collect.ForwardingSet; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/WhitelistCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/WhitelistCommands.java index 6850b00..b849a5c 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/WhitelistCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whitelist/WhitelistCommands.java @@ -1,18 +1,16 @@ package tc.oc.commons.bukkit.whitelist; -import java.util.Iterator; -import javax.inject.Inject; - import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.NestedCommand; +import java.util.Iterator; +import javax.inject.Inject; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.command.CommandSender; import tc.oc.api.docs.PlayerId; -import tc.oc.minecraft.scheduler.SyncExecutor; import tc.oc.commons.bukkit.chat.Audiences; import tc.oc.commons.bukkit.chat.ListComponent; import tc.oc.commons.bukkit.chat.NameStyle; @@ -26,6 +24,7 @@ import tc.oc.commons.core.commands.CommandFutureCallback; import tc.oc.commons.core.commands.Commands; import tc.oc.commons.core.commands.NestedCommands; import tc.oc.commons.core.commands.TranslatableCommandException; +import tc.oc.minecraft.scheduler.SyncExecutor; public class WhitelistCommands implements NestedCommands { diff --git a/Commons/bukkit/src/main/java/tc/oc/parse/DocumentWatcher.java b/Commons/bukkit/src/main/java/tc/oc/parse/DocumentWatcher.java index bf4c692..086a7a2 100644 --- a/Commons/bukkit/src/main/java/tc/oc/parse/DocumentWatcher.java +++ b/Commons/bukkit/src/main/java/tc/oc/parse/DocumentWatcher.java @@ -1,5 +1,6 @@ package tc.oc.parse; +import com.google.inject.assistedinject.Assisted; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; @@ -7,14 +8,12 @@ import java.util.function.Consumer; import java.util.logging.Level; import javax.inject.Inject; import javax.xml.parsers.DocumentBuilder; - -import com.google.inject.assistedinject.Assisted; import org.xml.sax.SAXException; import tc.oc.commons.bukkit.logging.MapdevLogger; -import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.file.PathWatcher; import tc.oc.file.PathWatcherHandle; import tc.oc.file.PathWatcherService; +import tc.oc.minecraft.scheduler.MainThreadExecutor; import tc.oc.parse.xml.DocumentParser; /** diff --git a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/CapsuleTest.java b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/CapsuleTest.java index 1352b5b..97ff70e 100644 --- a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/CapsuleTest.java +++ b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/CapsuleTest.java @@ -1,13 +1,13 @@ package tc.oc.commons.bukkit.geometry; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import org.bukkit.util.ImVector; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; - @RunWith(JUnit4.class) public class CapsuleTest { diff --git a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/LineSegmentTest.java b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/LineSegmentTest.java index 78c7210..ea79e5e 100644 --- a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/LineSegmentTest.java +++ b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/geometry/LineSegmentTest.java @@ -1,13 +1,13 @@ package tc.oc.commons.bukkit.geometry; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.bukkit.util.ImVector; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - @RunWith(JUnit4.class) public class LineSegmentTest { diff --git a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/LocalesTest.java b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/LocalesTest.java index c849bb7..2064eda 100644 --- a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/LocalesTest.java +++ b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/LocalesTest.java @@ -1,15 +1,13 @@ package tc.oc.commons.bukkit.localization; -import java.util.Locale; -import java.util.Set; +import static tc.oc.test.Assert.assertSequence; import com.google.common.collect.ImmutableSet; +import java.util.Locale; +import java.util.Set; import org.junit.Test; import tc.oc.commons.core.localization.Locales; -import static tc.oc.test.Assert.*; -import static org.junit.Assert.*; - public class LocalesTest { @Test diff --git a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/TranslationKeyTests.java b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/TranslationKeyTests.java index d52b850..bfc7e8e 100644 --- a/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/TranslationKeyTests.java +++ b/Commons/bukkit/src/test/java/tc/oc/commons/bukkit/localization/TranslationKeyTests.java @@ -1,13 +1,12 @@ package tc.oc.commons.bukkit.localization; -import javax.inject.Inject; +import static org.junit.Assert.assertTrue; +import javax.inject.Inject; import org.junit.Test; import tc.oc.api.docs.virtual.MapDoc; import tc.oc.commons.CommonsBukkitTest; -import static org.junit.Assert.assertTrue; - public class TranslationKeyTests extends CommonsBukkitTest { @Inject Translations translations;