From 307614e7049a4a175fca914137aff974cd1f7d1c Mon Sep 17 00:00:00 2001 From: Luck Date: Thu, 31 Jan 2019 00:53:42 +0000 Subject: [PATCH] Cleanup import statements --- .../bukkit/calculator/DefaultsProcessor.java | 1 + .../bukkit/inject/permissible/LPPermissible.java | 2 ++ .../permissible/MonitoredPermissibleBase.java | 1 + .../bukkit/vault/LuckPermsVaultPermission.java | 3 +++ .../listeners/BungeePermissionCheckListener.java | 1 + .../common/cacheddata/type/PermissionCache.java | 1 + .../common/calculator/PermissionCalculator.java | 2 ++ .../calculator/processor/RegexProcessor.java | 1 + .../calculator/processor/WildcardProcessor.java | 1 + .../common/event/gen/GeneratedEventSpec.java | 1 - .../hikari/HikariConnectionFactory.java | 1 - .../lucko/luckperms/common/treeview/TreeView.java | 1 + .../luckperms/common/verbose/VerboseFilter.java | 6 ++++-- .../luckperms/common/verbose/VerboseListener.java | 2 ++ .../nukkit/inject/permissible/LPPermissible.java | 15 +++++++++------ .../permissible/MonitoredPermissibleBase.java | 11 ++++++----- .../model/calculated/CalculatedSubject.java | 1 + .../permissionholder/PermissionHolderSubject.java | 2 ++ .../MonitoringPermissionCheckListener.java | 2 ++ .../service/PlayerPermissionProvider.java | 2 ++ 20 files changed, 42 insertions(+), 15 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java index e8b6d27f..2360a249 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/DefaultsProcessor.java @@ -29,6 +29,7 @@ import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; import me.lucko.luckperms.common.calculator.result.TristateResult; + import org.bukkit.permissions.Permission; /** diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java index a463feab..7fb8eac9 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/LPPermissible.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.bukkit.inject.permissible; import com.google.common.collect.ImmutableList; + import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.bukkit.LPBukkitPlugin; import me.lucko.luckperms.common.config.ConfigKeys; @@ -33,6 +34,7 @@ import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; + import org.bukkit.entity.Player; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java index cd56ee93..73019aab 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/permissible/MonitoredPermissibleBase.java @@ -32,6 +32,7 @@ import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; + import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java index 6466157a..1f1f6282 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.bukkit.vault; import com.google.common.base.Preconditions; + import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Tristate; @@ -42,7 +43,9 @@ import me.lucko.luckperms.common.node.factory.NodeFactory; import me.lucko.luckperms.common.util.Uuids; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; + import net.milkbowl.vault.permission.Permission; + import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java b/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java index aed81ba0..ddf78384 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/listeners/BungeePermissionCheckListener.java @@ -33,6 +33,7 @@ import me.lucko.luckperms.bungee.event.TristateCheckEvent; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.User; + import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PermissionCheckEvent; import net.md_5.bungee.api.plugin.Listener; diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java index 02fc698f..df47dd80 100644 --- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java @@ -33,6 +33,7 @@ import me.lucko.luckperms.common.calculator.CalculatorFactory; import me.lucko.luckperms.common.calculator.PermissionCalculator; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java index 29846773..61ed42a2 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.common.calculator; import com.google.common.collect.ImmutableList; + import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.cacheddata.CacheMetadata; import me.lucko.luckperms.common.calculator.processor.PermissionProcessor; @@ -33,6 +34,7 @@ import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.util.LoadingMap; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; + import org.checkerframework.checker.nullness.qual.NonNull; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java index 38707677..b1ec9cba 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.common.calculator.processor; import com.google.common.collect.ImmutableMap; + import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.nodetype.types.RegexType; import me.lucko.luckperms.common.calculator.result.TristateResult; diff --git a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java index aba669cb..c3288478 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.common.calculator.processor; import com.google.common.collect.ImmutableMap; + import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.node.model.ImmutableNode; diff --git a/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java index 6f6f4669..f5e56bf1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/gen/GeneratedEventSpec.java @@ -34,7 +34,6 @@ import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.util.LoadingMap; import me.lucko.luckperms.common.util.PrivateMethodHandles; -import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/hikari/HikariConnectionFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/hikari/HikariConnectionFactory.java index 2e1d6049..8336e8ea 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/hikari/HikariConnectionFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/hikari/HikariConnectionFactory.java @@ -36,7 +36,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Objects; public abstract class HikariConnectionFactory implements ConnectionFactory { diff --git a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java index 3f4e73ba..198d43a9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java +++ b/common/src/main/java/me/lucko/luckperms/common/treeview/TreeView.java @@ -27,6 +27,7 @@ package me.lucko.luckperms.common.treeview; import com.google.common.base.Splitter; import com.google.gson.JsonObject; + import me.lucko.luckperms.common.cacheddata.type.PermissionCache; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.sender.Sender; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java index 921b586f..21cd73be 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseFilter.java @@ -26,17 +26,19 @@ package me.lucko.luckperms.common.verbose; import com.google.common.collect.ImmutableList; + import me.lucko.luckperms.common.util.Scripting; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.verbose.event.VerboseEvent; -import javax.script.ScriptEngine; -import javax.script.ScriptException; import java.util.List; import java.util.StringTokenizer; import java.util.stream.Collectors; +import javax.script.ScriptEngine; +import javax.script.ScriptException; + /** * Represents a verbose filter expression. * diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java index b897a586..d5a8e4ac 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.common.verbose; import com.google.gson.JsonObject; + import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.command.CommandManager; import me.lucko.luckperms.common.command.utils.MessageUtils; @@ -40,6 +41,7 @@ import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.verbose.event.VerboseEvent; import me.lucko.luckperms.common.web.Bytebin; + import net.kyori.text.TextComponent; import net.kyori.text.event.HoverEvent; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java index 46019043..41762049 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissible.java @@ -25,13 +25,8 @@ package me.lucko.luckperms.nukkit.inject.permissible; -import cn.nukkit.Player; -import cn.nukkit.permission.PermissibleBase; -import cn.nukkit.permission.Permission; -import cn.nukkit.permission.PermissionAttachment; -import cn.nukkit.permission.PermissionAttachmentInfo; -import cn.nukkit.plugin.Plugin; import com.google.common.collect.ImmutableList; + import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.ContextsSupplier; @@ -40,8 +35,16 @@ import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.nukkit.LPNukkitPlugin; import me.lucko.luckperms.nukkit.inject.PermissionDefault; + import org.checkerframework.checker.nullness.qual.NonNull; +import cn.nukkit.Player; +import cn.nukkit.permission.PermissibleBase; +import cn.nukkit.permission.Permission; +import cn.nukkit.permission.PermissionAttachment; +import cn.nukkit.permission.PermissionAttachmentInfo; +import cn.nukkit.plugin.Plugin; + import java.lang.reflect.Field; import java.util.Collection; import java.util.Iterator; diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java index f1f33b3e..e4bea414 100644 --- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java +++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/MonitoredPermissibleBase.java @@ -25,11 +25,6 @@ package me.lucko.luckperms.nukkit.inject.permissible; -import cn.nukkit.permission.PermissibleBase; -import cn.nukkit.permission.Permission; -import cn.nukkit.permission.PermissionAttachment; -import cn.nukkit.permission.PermissionAttachmentInfo; -import cn.nukkit.plugin.Plugin; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.common.calculator.result.TristateResult; @@ -38,6 +33,12 @@ import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.nukkit.inject.dummy.DummyPermissibleBase; +import cn.nukkit.permission.PermissibleBase; +import cn.nukkit.permission.Permission; +import cn.nukkit.permission.PermissionAttachment; +import cn.nukkit.permission.PermissionAttachmentInfo; +import cn.nukkit.plugin.Plugin; + import java.util.Map; /** diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java index 16e6c508..5ed5a7de 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubject.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.sponge.service.model.calculated; import com.google.common.collect.ImmutableList; + import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java index f81d6105..23c13c8e 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/permissionholder/PermissionHolderSubject.java @@ -26,6 +26,7 @@ package me.lucko.luckperms.sponge.service.model.permissionholder; import com.google.common.collect.ImmutableList; + import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ImmutableContextSet; @@ -45,6 +46,7 @@ import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.ProxyFactory; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectReference; + import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java b/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java index 8260b84a..b317b8f9 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/listeners/MonitoringPermissionCheckListener.java @@ -32,12 +32,14 @@ import com.velocitypowered.api.permission.PermissionFunction; import com.velocitypowered.api.permission.PermissionProvider; import com.velocitypowered.api.permission.PermissionSubject; import com.velocitypowered.api.proxy.Player; + import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.velocity.LPVelocityPlugin; import me.lucko.luckperms.velocity.service.CompatibilityUtil; + import org.checkerframework.checker.nullness.qual.NonNull; public class MonitoringPermissionCheckListener { diff --git a/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java index c5701cc2..6e907788 100644 --- a/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java +++ b/velocity/src/main/java/me/lucko/luckperms/velocity/service/PlayerPermissionProvider.java @@ -31,9 +31,11 @@ import com.velocitypowered.api.permission.PermissionProvider; import com.velocitypowered.api.permission.PermissionSubject; import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; + import me.lucko.luckperms.common.context.ContextsSupplier; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; + import org.checkerframework.checker.nullness.qual.NonNull; public class PlayerPermissionProvider implements PermissionProvider, PermissionFunction {