From 36335c10a425e494dfd9f8e2865b5ed5205ac757 Mon Sep 17 00:00:00 2001 From: Luck Date: Fri, 17 Apr 2020 17:49:32 +0100 Subject: [PATCH] Cleanup imports --- .../bukkit/BukkitAsyncCommandExecutor.java | 2 ++ .../bukkit/BukkitCommandExecutor.java | 8 ++++++- .../migration/MigrationPowerfulPerms.java | 22 ++++++++++++++++--- .../bungee/BungeeCommandExecutor.java | 1 + .../luckperms/bungee/LPBungeePlugin.java | 1 + .../cacheddata/type/SimpleMetaCache.java | 3 +++ .../luckperms/nukkit/LPNukkitPlugin.java | 21 ++++++++++++------ .../nukkit/NukkitCommandExecutor.java | 13 +++++++---- .../luckperms/velocity/LPVelocityPlugin.java | 2 ++ .../velocity/VelocityCommandExecutor.java | 2 ++ 10 files changed, 60 insertions(+), 15 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java index 9771227da..cb384970f 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitAsyncCommandExecutor.java @@ -26,8 +26,10 @@ package me.lucko.luckperms.bukkit; import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; + import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.sender.Sender; + import org.bukkit.command.Command; import org.bukkit.command.PluginCommand; import org.bukkit.event.EventHandler; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java index eab4c9f00..572aa10df 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java @@ -29,8 +29,14 @@ import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.sender.Sender; + import org.bukkit.Server; -import org.bukkit.command.*; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.command.PluginCommand; +import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java index 1672f214d..35a61791a 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java @@ -25,9 +25,14 @@ package me.lucko.luckperms.bukkit.migration; -import com.github.gustav9797.PowerfulPermsAPI.*; +import com.github.gustav9797.PowerfulPermsAPI.CachedGroup; +import com.github.gustav9797.PowerfulPermsAPI.Group; +import com.github.gustav9797.PowerfulPermsAPI.Permission; +import com.github.gustav9797.PowerfulPermsAPI.PermissionManager; +import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin; import com.google.common.collect.ImmutableSet; import com.zaxxer.hikari.HikariDataSource; + import me.lucko.luckperms.common.command.CommandResult; import me.lucko.luckperms.common.command.abstraction.ChildCommand; import me.lucko.luckperms.common.command.access.CommandPermission; @@ -49,14 +54,25 @@ import me.lucko.luckperms.common.storage.StorageType; import me.lucko.luckperms.common.util.Iterators; import me.lucko.luckperms.common.util.Predicates; import me.lucko.luckperms.common.util.ProgressLogger; + import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.event.cause.CreationCause; import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.NodeBuilder; + import org.bukkit.Bukkit; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java index 3f80d3244..10ae728d6 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommandExecutor.java @@ -28,6 +28,7 @@ package me.lucko.luckperms.bungee; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.sender.Sender; + import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Command; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java index 3f1014a0b..3021acbba 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -49,6 +49,7 @@ import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.common.sender.Sender; import me.lucko.luckperms.common.tasks.CacheHousekeepingTask; import me.lucko.luckperms.common.tasks.ExpireTemporaryTask; + import net.luckperms.api.LuckPerms; import net.luckperms.api.query.QueryOptions; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaCache.java index 0897aca03..b4b418f7b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaCache.java @@ -29,14 +29,17 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Multimaps; + import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.metastacking.MetaStack; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; + import net.luckperms.api.cacheddata.CachedMetaData; import net.luckperms.api.metastacking.MetaStackDefinition; import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.meta.MetaValueSelector; + import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java index bbd3e219d..abaf783ed 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java @@ -25,12 +25,6 @@ package me.lucko.luckperms.nukkit; -import cn.nukkit.Player; -import cn.nukkit.command.PluginCommand; -import cn.nukkit.permission.Permission; -import cn.nukkit.plugin.PluginManager; -import cn.nukkit.plugin.service.ServicePriority; -import cn.nukkit.utils.Config; import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.api.implementation.ApiUser; import me.lucko.luckperms.common.calculator.CalculatorFactory; @@ -55,13 +49,26 @@ import me.lucko.luckperms.nukkit.inject.PermissionDefault; import me.lucko.luckperms.nukkit.inject.permissible.LuckPermsPermissible; import me.lucko.luckperms.nukkit.inject.permissible.PermissibleInjector; import me.lucko.luckperms.nukkit.inject.permissible.PermissibleMonitoringInjector; -import me.lucko.luckperms.nukkit.inject.server.*; +import me.lucko.luckperms.nukkit.inject.server.InjectorDefaultsMap; +import me.lucko.luckperms.nukkit.inject.server.InjectorPermissionMap; +import me.lucko.luckperms.nukkit.inject.server.InjectorSubscriptionMap; +import me.lucko.luckperms.nukkit.inject.server.LuckPermsDefaultsMap; +import me.lucko.luckperms.nukkit.inject.server.LuckPermsPermissionMap; +import me.lucko.luckperms.nukkit.inject.server.LuckPermsSubscriptionMap; import me.lucko.luckperms.nukkit.listeners.NukkitConnectionListener; import me.lucko.luckperms.nukkit.listeners.NukkitPlatformListener; + import net.luckperms.api.LuckPerms; import net.luckperms.api.event.user.UserDataRecalculateEvent; import net.luckperms.api.query.QueryOptions; +import cn.nukkit.Player; +import cn.nukkit.command.PluginCommand; +import cn.nukkit.permission.Permission; +import cn.nukkit.plugin.PluginManager; +import cn.nukkit.plugin.service.ServicePriority; +import cn.nukkit.utils.Config; + import java.io.File; import java.util.Map; import java.util.Optional; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java index b3a1a1ed9..3622e8bbd 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/NukkitCommandExecutor.java @@ -25,14 +25,19 @@ package me.lucko.luckperms.nukkit; -import cn.nukkit.command.*; -import cn.nukkit.event.EventHandler; -import cn.nukkit.event.Listener; -import cn.nukkit.event.server.ServerCommandEvent; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.sender.Sender; +import cn.nukkit.command.Command; +import cn.nukkit.command.CommandExecutor; +import cn.nukkit.command.CommandSender; +import cn.nukkit.command.ConsoleCommandSender; +import cn.nukkit.command.PluginCommand; +import cn.nukkit.event.EventHandler; +import cn.nukkit.event.Listener; +import cn.nukkit.event.server.ServerCommandEvent; + import java.util.List; public class NukkitCommandExecutor extends CommandManager implements CommandExecutor, Listener { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java index 4af952d56..5c9d0ffa1 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/LPVelocityPlugin.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.velocity; import com.velocitypowered.api.proxy.Player; + import me.lucko.luckperms.common.api.LuckPermsApiProvider; import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.command.CommandManager; @@ -50,6 +51,7 @@ import me.lucko.luckperms.velocity.context.VelocityContextManager; import me.lucko.luckperms.velocity.listeners.MonitoringPermissionCheckListener; import me.lucko.luckperms.velocity.listeners.VelocityConnectionListener; import me.lucko.luckperms.velocity.messaging.VelocityMessagingFactory; + import net.luckperms.api.LuckPerms; import net.luckperms.api.query.QueryOptions; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java index e463ce565..1eb86d990 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/VelocityCommandExecutor.java @@ -29,9 +29,11 @@ import com.velocitypowered.api.command.Command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.ConsoleCommandSource; import com.velocitypowered.api.proxy.ProxyServer; + import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.ArgumentTokenizer; import me.lucko.luckperms.common.sender.Sender; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Arrays;