cleanup imports

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<CommandSender> {
     private final MessageHandler messageHandler;
 

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<Object> {
     public MigrationPermissionsEx() {
         super("permissionsex", "Migration from PermissionsEx", Permission.MIGRATION, Predicates.alwaysFalse(),

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;

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<CommandSender> {
     public BungeeSenderFactory(LuckPermsPlugin plugin) {
         super(plugin);

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

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}
  *

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.
  */

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
  *

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
  */

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
  */

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;

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<LPSpongePlugin> {
     private ConfigurationNode root;
 

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;

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<CommandSource> {
     public SpongeSenderFactory(LuckPermsPlugin plugin) {
         super(plugin);

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;
 

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;
 

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

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

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
  */

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 {

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
  */

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<LPTiming, Timing> timings;