diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java index cd8faa334..7c7e0d28e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java @@ -30,10 +30,10 @@ import me.lucko.luckperms.common.constants.Constants; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.util.UUID; - import io.github.mkremins.fanciful.FancyMessage; +import java.util.UUID; + public class BukkitSenderFactory extends SenderFactory { private final MessageHandler messageHandler; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java index 43dc68b77..e3bef2d2a 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java @@ -39,17 +39,17 @@ import me.lucko.luckperms.common.data.LogEntry; import me.lucko.luckperms.common.utils.Predicates; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import java.lang.reflect.Field; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; - import ru.tehkode.permissions.NativeInterface; import ru.tehkode.permissions.PermissionGroup; import ru.tehkode.permissions.PermissionManager; import ru.tehkode.permissions.PermissionUser; import ru.tehkode.permissions.bukkit.PermissionsEx; +import java.lang.reflect.Field; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + public class MigrationPermissionsEx extends SubCommand { public MigrationPermissionsEx() { super("permissionsex", "Migration from PermissionsEx", Permission.MIGRATION, Predicates.alwaysFalse(), diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java index b2bc24ce3..7139a945d 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java @@ -39,7 +39,11 @@ import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService; import org.tyrannyofheaven.bukkit.zPermissions.dao.PermissionService; -import org.tyrannyofheaven.bukkit.zPermissions.model.*; +import org.tyrannyofheaven.bukkit.zPermissions.model.EntityMetadata; +import org.tyrannyofheaven.bukkit.zPermissions.model.Entry; +import org.tyrannyofheaven.bukkit.zPermissions.model.Inheritance; +import org.tyrannyofheaven.bukkit.zPermissions.model.Membership; +import org.tyrannyofheaven.bukkit.zPermissions.model.PermissionEntity; import java.lang.reflect.Field; import java.util.List; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java index 312e873e8..7c5619d02 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java @@ -31,10 +31,10 @@ import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.chat.ComponentSerializer; -import java.util.UUID; - import io.github.mkremins.fanciful.FancyMessage; +import java.util.UUID; + public class BungeeSenderFactory extends SenderFactory { public BungeeSenderFactory(LuckPermsPlugin plugin) { super(plugin); diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java b/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java index 6afde4a8e..fc6044aa3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java @@ -52,6 +52,9 @@ import me.lucko.luckperms.common.commands.utils.Util; import me.lucko.luckperms.common.constants.Message; import me.lucko.luckperms.common.constants.Permission; +import io.github.mkremins.fanciful.ChatColor; +import io.github.mkremins.fanciful.FancyMessage; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -59,9 +62,6 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; -import io.github.mkremins.fanciful.ChatColor; -import io.github.mkremins.fanciful.FancyMessage; - public class CommandManager { @Getter diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java b/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java index 7baac980c..3cd826ae0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java @@ -28,11 +28,11 @@ import me.lucko.luckperms.common.LuckPermsPlugin; import me.lucko.luckperms.common.constants.Constants; import me.lucko.luckperms.common.constants.Permission; +import io.github.mkremins.fanciful.FancyMessage; + import java.lang.ref.WeakReference; import java.util.UUID; -import io.github.mkremins.fanciful.FancyMessage; - /** * Simple implementation of {@link Sender} using a {@link SenderFactory} * diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java b/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java index 221feb3c1..3f08fdae1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java @@ -26,10 +26,10 @@ import me.lucko.luckperms.common.LuckPermsPlugin; import me.lucko.luckperms.common.constants.Constants; import me.lucko.luckperms.common.constants.Permission; -import java.util.UUID; - import io.github.mkremins.fanciful.FancyMessage; +import java.util.UUID; + /** * Wrapper interface to represent a CommandSender/CommandSource within the common command implementations. */ diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/sender/SenderFactory.java b/common/src/main/java/me/lucko/luckperms/common/commands/sender/SenderFactory.java index bd3276688..c70204784 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/sender/SenderFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/sender/SenderFactory.java @@ -26,10 +26,10 @@ import lombok.RequiredArgsConstructor; import me.lucko.luckperms.common.LuckPermsPlugin; -import java.util.UUID; - import io.github.mkremins.fanciful.FancyMessage; +import java.util.UUID; + /** * Factory class to make a thread-safe sender instance * diff --git a/common/src/main/java/me/lucko/luckperms/common/data/Importer.java b/common/src/main/java/me/lucko/luckperms/common/data/Importer.java index a4fc52c35..0ecb6255c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/data/Importer.java +++ b/common/src/main/java/me/lucko/luckperms/common/data/Importer.java @@ -37,6 +37,8 @@ import me.lucko.luckperms.common.constants.Constants; import me.lucko.luckperms.common.constants.Message; import me.lucko.luckperms.common.constants.Permission; +import io.github.mkremins.fanciful.FancyMessage; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -44,8 +46,6 @@ import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; -import io.github.mkremins.fanciful.FancyMessage; - /** * Class to handle import operations */ diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java b/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java index 2b94cbee0..9998fcdbc 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java @@ -27,16 +27,16 @@ import lombok.RequiredArgsConstructor; import me.lucko.luckperms.api.MessagingService; import me.lucko.luckperms.common.LuckPermsPlugin; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; import redis.clients.jedis.JedisPubSub; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * Uses Redis to push/receive changes to/from other servers */ diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java index 1283b06cb..e553cdcb2 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java @@ -37,13 +37,13 @@ import org.spongepowered.api.text.Text; import org.spongepowered.api.world.Location; import org.spongepowered.api.world.World; +import co.aikar.timings.Timing; + import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import co.aikar.timings.Timing; - @SuppressWarnings("NullableProblems") class SpongeCommand extends CommandManager implements CommandCallable { private final LPSpongePlugin plugin; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java index 8ecc0601c..3ec1823bd 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java @@ -26,6 +26,11 @@ import com.google.common.base.Splitter; import me.lucko.luckperms.common.config.AbstractConfiguration; +import ninja.leaping.configurate.ConfigurationNode; +import ninja.leaping.configurate.commented.CommentedConfigurationNode; +import ninja.leaping.configurate.hocon.HoconConfigurationLoader; +import ninja.leaping.configurate.loader.ConfigurationLoader; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -36,11 +41,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import ninja.leaping.configurate.ConfigurationNode; -import ninja.leaping.configurate.commented.CommentedConfigurationNode; -import ninja.leaping.configurate.hocon.HoconConfigurationLoader; -import ninja.leaping.configurate.loader.ConfigurationLoader; - class SpongeConfig extends AbstractConfiguration { private ConfigurationNode root; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java index 99609ad85..5a1574039 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java @@ -39,12 +39,12 @@ import org.spongepowered.api.profile.GameProfile; import org.spongepowered.api.text.serializer.TextSerializers; import org.spongepowered.api.world.World; +import co.aikar.timings.Timing; + import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import co.aikar.timings.Timing; - @SuppressWarnings("WeakerAccess") public class SpongeListener extends AbstractListener { private final LPSpongePlugin plugin; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java index 7dce1110d..58385b57f 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java @@ -30,10 +30,10 @@ import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.text.serializer.TextSerializers; -import java.util.UUID; - import io.github.mkremins.fanciful.FancyMessage; +import java.util.UUID; + public class SpongeSenderFactory extends SenderFactory { public SpongeSenderFactory(LuckPermsPlugin plugin) { super(plugin); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java index ce9356a49..3589237b8 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java @@ -47,11 +47,11 @@ import me.lucko.luckperms.sponge.timings.LPTiming; import org.spongepowered.api.service.permission.PermissionService; +import co.aikar.timings.Timing; + import java.util.Collection; import java.util.Map; -import co.aikar.timings.Timing; - public class SpongeGroupManager implements GroupManager, LPSubjectCollection { private final LPSpongePlugin plugin; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java index df1ba7695..7f70b06d7 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java @@ -49,13 +49,13 @@ import me.lucko.luckperms.sponge.timings.LPTiming; import org.spongepowered.api.service.permission.PermissionService; +import co.aikar.timings.Timing; + import java.util.Collection; import java.util.Map; import java.util.Set; import java.util.UUID; -import co.aikar.timings.Timing; - public class SpongeUserManager implements UserManager, LPSubjectCollection { private final LPSpongePlugin plugin; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java index e6bd9c8f6..2e56fc2ab 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java @@ -46,13 +46,13 @@ import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.service.permission.NodeTree; import org.spongepowered.api.service.permission.PermissionService; +import co.aikar.timings.Timing; + import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import co.aikar.timings.Timing; - public class SpongeGroup extends Group { @Getter diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java index 7c7da46de..95c3518ce 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java @@ -43,12 +43,12 @@ import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.service.permission.PermissionService; +import co.aikar.timings.Timing; + import java.util.Optional; import java.util.Set; import java.util.UUID; -import co.aikar.timings.Timing; - public class SpongeUser extends User { @Getter diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java index e3db26331..3adafec9a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java @@ -66,6 +66,8 @@ import org.spongepowered.api.service.permission.Subject; import org.spongepowered.api.service.permission.SubjectCollection; import org.spongepowered.api.text.Text; +import co.aikar.timings.Timing; + import java.io.File; import java.util.Collection; import java.util.Collections; @@ -75,8 +77,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import co.aikar.timings.Timing; - /** * The LuckPerms implementation of the Sponge Permission Service */ diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java index 278eb1f25..1f6c6afcb 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java @@ -50,6 +50,8 @@ import me.lucko.luckperms.sponge.timings.LPTiming; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.PermissionService; +import co.aikar.timings.Timing; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -58,8 +60,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import co.aikar.timings.Timing; - @SuppressWarnings({"OptionalGetWithoutIsPresent", "unused"}) @AllArgsConstructor public class LuckPermsSubjectData implements LPSubjectData { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java index 28b905793..6a2882f2c 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java @@ -45,13 +45,13 @@ import me.lucko.luckperms.sponge.timings.LPTiming; import org.spongepowered.api.command.CommandSource; +import co.aikar.timings.Timing; + import java.io.IOException; import java.util.HashSet; import java.util.Optional; import java.util.Set; -import co.aikar.timings.Timing; - /** * A simple persistable Subject implementation */ diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/timings/LPTimings.java b/sponge/src/main/java/me/lucko/luckperms/sponge/timings/LPTimings.java index 6c8e28a6e..e340fb9b4 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/timings/LPTimings.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/timings/LPTimings.java @@ -28,11 +28,11 @@ import com.google.common.collect.ImmutableMap; import me.lucko.luckperms.sponge.LPSpongePlugin; -import java.util.Map; - import co.aikar.timings.Timing; import co.aikar.timings.Timings; +import java.util.Map; + public class LPTimings { private final Map timings;