Optimize imports

src/main/java/dev/plex/Plex.java

@@ -22,15 +22,12 @@ import dev.plex.storage.StorageType;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import dev.plex.world.CustomWorld;
+import java.util.UUID;
 import lombok.Getter;
 import lombok.Setter;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.UUID;
-
 @Getter
 @Setter
 public class Plex extends JavaPlugin

src/main/java/dev/plex/admin/Admin.java

@@ -1,12 +1,11 @@
 package dev.plex.admin;
 
 import dev.plex.rank.enums.Rank;
+import java.util.UUID;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.UUID;
-
 @Getter
 @Setter
 public class Admin

src/main/java/dev/plex/admin/AdminList.java

@@ -8,7 +8,6 @@ import dev.plex.Plex;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.storage.StorageType;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

src/main/java/dev/plex/banning/Ban.java

@@ -4,14 +4,13 @@ import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 import dev.morphia.annotations.IndexOptions;
 import dev.morphia.annotations.Indexed;
+import java.util.Date;
+import java.util.UUID;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang.RandomStringUtils;
 
-import java.util.Date;
-import java.util.UUID;
-
 @Getter
 @Setter
 @Entity(value = "bans", useDiscriminator = false)

src/main/java/dev/plex/banning/BanManager.java

@@ -1,13 +1,11 @@
 package dev.plex.banning;
 
 import com.google.common.collect.Lists;
-import dev.morphia.query.MorphiaCursor;
 import dev.morphia.query.Query;
 import dev.morphia.query.experimental.filters.Filters;
 import dev.morphia.query.experimental.updates.UpdateOperators;
 import dev.plex.Plex;
 import dev.plex.storage.StorageType;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

src/main/java/dev/plex/cache/DataUtils.java

@@ -3,9 +3,8 @@ package dev.plex.cache;
 import dev.plex.Plex;
 import dev.plex.player.PlexPlayer;
 import dev.plex.storage.StorageType;
-import org.bukkit.Bukkit;
-
 import java.util.UUID;
+import org.bukkit.Bukkit;
 
 public class DataUtils
 {

src/main/java/dev/plex/cache/MongoPlayerData.java

@@ -7,7 +7,6 @@ import dev.morphia.query.experimental.filters.Filters;
 import dev.morphia.query.experimental.updates.UpdateOperators;
 import dev.plex.Plex;
 import dev.plex.player.PlexPlayer;
-
 import java.util.UUID;
 
 public class MongoPlayerData

src/main/java/dev/plex/cache/PlayerCache.java

@@ -3,7 +3,6 @@ package dev.plex.cache;
 import com.google.common.collect.Maps;
 import dev.plex.player.PlexPlayer;
 import dev.plex.player.PunishedPlayer;
-
 import java.util.Map;
 import java.util.UUID;
 

src/main/java/dev/plex/cache/SQLPlayerData.java

@@ -4,7 +4,6 @@ import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import dev.plex.Plex;
 import dev.plex.player.PlexPlayer;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

src/main/java/dev/plex/command/annotation/CommandPermissions.java

@@ -2,7 +2,6 @@ package dev.plex.command.annotation;
 
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

src/main/java/dev/plex/command/impl/AdminCMD.java

@@ -14,16 +14,15 @@ import dev.plex.event.AdminSetRankEvent;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
 @CommandPermissions(level = Rank.SENIOR_ADMIN, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "admin", usage = "/<command> <add | remove | setrank | list> [player] [rank]", aliases = "saconfig,slconfig,adminconfig,adminmanage", description = "Manage all admins")
 public class AdminCMD extends PlexCommand

src/main/java/dev/plex/command/impl/AdminworldCMD.java

@@ -11,9 +11,6 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.Collections;
-import java.util.List;
-
 @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "adminworld", aliases = "aw", description = "Teleport to the adminworld")
 public class AdminworldCMD extends PlexCommand

src/main/java/dev/plex/command/impl/AdventureCMD.java

@@ -8,6 +8,7 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -15,8 +16,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "adventure", aliases = "gma", description = "Set your own or another player's gamemode to adventure mode")
 public class AdventureCMD extends PlexCommand

src/main/java/dev/plex/command/impl/BanCMD.java

@@ -14,17 +14,16 @@ import dev.plex.punishment.Punishment;
 import dev.plex.punishment.PunishmentType;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.time.Instant;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
 @CommandParameters(name = "ban", usage = "/<command> <player> [reason]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online")
 @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.ANY)
 

src/main/java/dev/plex/command/impl/CreativeCMD.java

@@ -8,6 +8,7 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -15,8 +16,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "creative", aliases = "gmc", description = "Set your own or another player's gamemode to creative mode")
 public class CreativeCMD extends PlexCommand

src/main/java/dev/plex/command/impl/FlatlandsCMD.java

@@ -11,9 +11,6 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.Collections;
-import java.util.List;
-
 @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "flatlands", description = "Teleport to the flatlands")
 public class FlatlandsCMD extends PlexCommand

src/main/java/dev/plex/command/impl/FreezeCMD.java

@@ -11,15 +11,14 @@ import dev.plex.punishment.Punishment;
 import dev.plex.punishment.PunishmentType;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import net.kyori.adventure.text.Component;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import net.kyori.adventure.text.Component;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 @CommandParameters(name = "freeze", description = "Freeze a player on the server", usage = "/<command> <player>")
 @CommandPermissions(level = Rank.ADMIN)

src/main/java/dev/plex/command/impl/ListCMD.java

@@ -5,15 +5,13 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.rank.enums.Rank;
-import net.bytebuddy.description.NamedElement;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.List;
-
 @CommandParameters(name = "list", description = "Freeze a player on the server", usage = "/<command> <player>")
 @CommandPermissions(level = Rank.OP)
 public class ListCMD extends PlexCommand

src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java

@@ -11,9 +11,6 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.Collections;
-import java.util.List;
-
 @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "masterbuilderworld", aliases = "mbw", description = "Teleport to the Master Builder world")
 public class MasterbuilderworldCMD extends PlexCommand

src/main/java/dev/plex/command/impl/NameHistoryCMD.java

@@ -10,6 +10,11 @@ import dev.plex.rank.enums.Rank;
 import dev.plex.util.MojangUtils;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -18,12 +23,6 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 @CommandParameters(name = "namehistory", description = "Get the name history of a player", usage = "/<command> <player>", aliases = "nh")
 @CommandPermissions(level = Rank.OP)
 public class NameHistoryCMD extends PlexCommand

src/main/java/dev/plex/command/impl/OpAllCMD.java

@@ -1,6 +1,5 @@
 package dev.plex.command.impl;
 
-import com.google.common.collect.ImmutableList;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
@@ -11,8 +10,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.List;
-
 @CommandParameters(name = "opall", description = "Op everyone on the server", aliases = "opa")
 @CommandPermissions(level = Rank.ADMIN)
 public class OpAllCMD extends PlexCommand

src/main/java/dev/plex/command/impl/OpCMD.java

@@ -7,13 +7,12 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandArgumentException;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 @CommandParameters(name = "op", description = "Op a player on the server", usage = "/<command> <player>")
 @CommandPermissions(level = Rank.OP)
 public class OpCMD extends PlexCommand

src/main/java/dev/plex/command/impl/PlexCMD.java

@@ -8,13 +8,12 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandArgumentException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "plex", usage = "/<command> [reload]", aliases = "plexhelp", description = "Show information about Plex or reload it")
 public class PlexCMD extends PlexCommand {

src/main/java/dev/plex/command/impl/PunishmentsCMD.java

@@ -8,13 +8,12 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.menu.PunishmentMenu;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 @CommandParameters(name = "punishments", usage = "/<command> [player]", description = "Opens the Punishments GUI", aliases = "punishlist,punishes")
 @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.IN_GAME)
 public class PunishmentsCMD extends PlexCommand

src/main/java/dev/plex/command/impl/RankCMD.java

@@ -9,8 +9,6 @@ import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.List;
-
 // TODO: See ranks of other players
 
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.IN_GAME)

src/main/java/dev/plex/command/impl/SpectatorCMD.java

@@ -8,6 +8,7 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -15,8 +16,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "spectator", aliases = "gmsp", description = "Set your own or another player's gamemode to spectator mode")
 public class SpectatorCMD extends PlexCommand

src/main/java/dev/plex/command/impl/SurvivalCMD.java

@@ -8,6 +8,7 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -15,8 +16,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "survival", aliases = "gms", description = "Set your own or another player's gamemode to survival mode")
 public class SurvivalCMD extends PlexCommand

src/main/java/dev/plex/command/impl/WorldCMD.java

@@ -7,6 +7,8 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandArgumentException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
+import java.util.List;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -15,10 +17,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "world", description = "Teleport to a world.", usage = "/<command> <world>")
 public class WorldCMD extends PlexCommand

src/main/java/dev/plex/config/Config.java

@@ -1,9 +1,8 @@
 package dev.plex.config;
 
 import dev.plex.Plex;
-import org.bukkit.configuration.file.YamlConfiguration;
-
 import java.io.File;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 public class Config extends YamlConfiguration
 {

src/main/java/dev/plex/event/PunishedPlayerEvent.java

@@ -1,14 +1,13 @@
 package dev.plex.event;
 
 import dev.plex.player.PunishedPlayer;
+import java.util.UUID;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.player.PlayerEvent;
 
-import java.util.UUID;
-
 @Getter
 public abstract class PunishedPlayerEvent extends PlayerEvent implements Cancellable
 {

src/main/java/dev/plex/handlers/CommandHandler.java

@@ -2,9 +2,25 @@ package dev.plex.handlers;
 
 import com.google.common.collect.Lists;
 import dev.plex.command.PlexCommand;
-import dev.plex.command.impl.*;
+import dev.plex.command.impl.AdminCMD;
+import dev.plex.command.impl.AdminworldCMD;
+import dev.plex.command.impl.AdventureCMD;
+import dev.plex.command.impl.BanCMD;
+import dev.plex.command.impl.CreativeCMD;
+import dev.plex.command.impl.FlatlandsCMD;
+import dev.plex.command.impl.FreezeCMD;
+import dev.plex.command.impl.ListCMD;
+import dev.plex.command.impl.MasterbuilderworldCMD;
+import dev.plex.command.impl.NameHistoryCMD;
+import dev.plex.command.impl.OpAllCMD;
+import dev.plex.command.impl.OpCMD;
+import dev.plex.command.impl.PlexCMD;
+import dev.plex.command.impl.PunishmentsCMD;
+import dev.plex.command.impl.RankCMD;
+import dev.plex.command.impl.SpectatorCMD;
+import dev.plex.command.impl.SurvivalCMD;
+import dev.plex.command.impl.WorldCMD;
 import dev.plex.util.PlexLog;
-
 import java.util.List;
 
 public class CommandHandler

src/main/java/dev/plex/handlers/ListenerHandler.java

@@ -2,9 +2,14 @@ package dev.plex.handlers;
 
 import com.google.common.collect.Lists;
 import dev.plex.listener.PlexListener;
-import dev.plex.listener.impl.*;
+import dev.plex.listener.impl.AdminListener;
+import dev.plex.listener.impl.ChatListener;
+import dev.plex.listener.impl.FreezeListener;
+import dev.plex.listener.impl.LoginListener;
+import dev.plex.listener.impl.PlayerListener;
+import dev.plex.listener.impl.ServerListener;
+import dev.plex.listener.impl.WorldListener;
 import dev.plex.util.PlexLog;
-
 import java.util.List;
 
 public class ListenerHandler

src/main/java/dev/plex/listener/impl/AdminListener.java

@@ -8,7 +8,6 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import org.bukkit.event.EventHandler;
-
 import static dev.plex.util.PlexUtils.tl;
 
 public class AdminListener extends PlexListener

src/main/java/dev/plex/listener/impl/ChatListener.java

@@ -10,7 +10,6 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import net.md_5.bungee.api.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.jetbrains.annotations.NotNull;

src/main/java/dev/plex/listener/impl/LoginListener.java

@@ -1,7 +1,6 @@
 package dev.plex.listener.impl;
 
 import dev.plex.listener.PlexListener;
-import dev.plex.util.PlexLog;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 

src/main/java/dev/plex/listener/impl/PlayerListener.java

@@ -9,19 +9,16 @@ import dev.plex.listener.PlexListener;
 import dev.plex.player.PlexPlayer;
 import dev.plex.player.PunishedPlayer;
 import dev.plex.util.PlexLog;
+import java.util.Collections;
+import java.util.UUID;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.ChatColor;
-import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.UUID;
-
 public class PlayerListener extends PlexListener
 {
     private final MongoPlayerData mongoPlayerData = plugin.getMongoPlayerData() != null ? plugin.getMongoPlayerData() : null;

src/main/java/dev/plex/listener/impl/WorldListener.java

@@ -10,7 +10,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
-
 import static dev.plex.util.PlexUtils.tl;
 
 public class WorldListener extends PlexListener

src/main/java/dev/plex/menu/PunishedPlayerMenu.java

@@ -5,6 +5,8 @@ import dev.plex.cache.PlayerCache;
 import dev.plex.player.PunishedPlayer;
 import dev.plex.punishment.Punishment;
 import dev.plex.util.menu.AbstractMenu;
+import java.util.Arrays;
+import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -17,9 +19,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
-import java.util.Arrays;
-import java.util.List;
-
 public class PunishedPlayerMenu extends AbstractMenu
 {
     private final PunishedPlayer punishedPlayer;

src/main/java/dev/plex/menu/PunishmentMenu.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import dev.plex.cache.PlayerCache;
 import dev.plex.player.PunishedPlayer;
 import dev.plex.util.menu.AbstractMenu;
+import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -16,8 +17,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
-import java.util.List;
-
 public class PunishmentMenu extends AbstractMenu
 {
 

src/main/java/dev/plex/player/PlexPlayer.java

@@ -5,19 +5,16 @@ import dev.morphia.annotations.Id;
 import dev.morphia.annotations.IndexOptions;
 import dev.morphia.annotations.Indexed;
 import dev.plex.rank.enums.Rank;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import net.kyori.adventure.text.serializer.ComponentSerializer;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
 
 @Getter
 @Setter

src/main/java/dev/plex/player/PunishedPlayer.java

@@ -5,14 +5,6 @@ import dev.plex.Plex;
 import dev.plex.event.PunishedPlayerFreezeEvent;
 import dev.plex.event.PunishedPlayerMuteEvent;
 import dev.plex.punishment.Punishment;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.commons.io.FileUtils;
-import org.bukkit.Bukkit;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -20,6 +12,13 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.UUID;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.io.FileUtils;
+import org.bukkit.Bukkit;
+import org.json.JSONObject;
+import org.json.JSONTokener;
 
 @Getter
 public class PunishedPlayer

src/main/java/dev/plex/punishment/Punishment.java

@@ -2,12 +2,11 @@ package dev.plex.punishment;
 
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
-import lombok.Getter;
-import lombok.Setter;
-
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 @Setter

src/main/java/dev/plex/punishment/PunishmentManager.java

@@ -6,12 +6,6 @@ import dev.plex.Plex;
 import dev.plex.banning.Ban;
 import dev.plex.player.PunishedPlayer;
 import dev.plex.util.PlexUtils;
-import org.apache.commons.io.FileUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileWriter;
@@ -22,6 +16,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import org.apache.commons.io.FileUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.json.JSONObject;
+import org.json.JSONTokener;
 
 public class PunishmentManager
 {

src/main/java/dev/plex/rank/RankManager.java

@@ -5,15 +5,14 @@ import dev.plex.Plex;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexLog;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.json.JSONObject;
+import org.json.JSONTokener;
 
 public class RankManager
 {

src/main/java/dev/plex/rank/enums/Rank.java

@@ -1,9 +1,8 @@
 package dev.plex.rank.enums;
 
 import com.google.common.collect.Lists;
-import org.bukkit.ChatColor;
-
 import java.util.List;
+import org.bukkit.ChatColor;
 
 public enum Rank
 {

src/main/java/dev/plex/services/ServiceManager.java

@@ -4,9 +4,8 @@ import com.google.common.collect.Lists;
 import dev.plex.Plex;
 import dev.plex.services.impl.BanService;
 import dev.plex.services.impl.GameRuleService;
-import org.bukkit.Bukkit;
-
 import java.util.List;
+import org.bukkit.Bukkit;
 
 public class ServiceManager {
     private final List<AbstractService> services = Lists.newArrayList();

src/main/java/dev/plex/services/impl/BanService.java

@@ -3,9 +3,8 @@ package dev.plex.services.impl;
 import dev.plex.Plex;
 import dev.plex.banning.Ban;
 import dev.plex.services.AbstractService;
-import org.bukkit.Bukkit;
-
 import java.util.Date;
+import org.bukkit.Bukkit;
 
 public class BanService extends AbstractService
 {

src/main/java/dev/plex/storage/SQLConnection.java

@@ -2,7 +2,6 @@ package dev.plex.storage;
 
 import dev.plex.Plex;
 import dev.plex.PlexBase;
-
 import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;

src/main/java/dev/plex/util/MojangUtils.java

@@ -1,6 +1,15 @@
 package dev.plex.util;
 
 import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -9,14 +18,6 @@ import org.apache.http.util.EntityUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.*;
-import java.util.stream.Collectors;
-
 public class MojangUtils
 {
     public static UUID getUUID(String name)

src/main/java/dev/plex/util/PlexUtils.java

@@ -3,9 +3,28 @@ package dev.plex.util;
 import dev.plex.Plex;
 import dev.plex.config.Config;
 import dev.plex.storage.StorageType;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.PluginCommandYamlParser;
 import org.bukkit.entity.Player;
@@ -14,16 +33,6 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-
 public class PlexUtils
 {
     public static Map<String, ChatColor> CHAT_COLOR_NAMES;

src/main/java/dev/plex/world/ConfigurationChunkGenerator.java

@@ -1,11 +1,10 @@
 package dev.plex.world;
 
 import dev.plex.Plex;
+import java.util.LinkedHashMap;
 import org.bukkit.Material;
 import org.bukkit.generator.BlockPopulator;
 
-import java.util.LinkedHashMap;
-
 public class ConfigurationChunkGenerator extends BlockMapChunkGenerator
 {
     private static final Plex plugin = Plex.get();

src/main/java/dev/plex/world/CustomChunkGenerator.java

@@ -1,11 +1,10 @@
 package dev.plex.world;
 
-import org.bukkit.World;
-import org.bukkit.generator.BlockPopulator;
-import org.bukkit.generator.ChunkGenerator;
-
 import java.util.Arrays;
 import java.util.List;
+import org.bukkit.World;
+import org.bukkit.generator.BlockPopulator;
+import org.bukkit.generator.ChunkGenerator;
 
 public abstract class CustomChunkGenerator extends ChunkGenerator
 {

src/main/java/dev/plex/world/CustomWorld.java

@@ -1,6 +1,8 @@
 package dev.plex.world;
 
 import dev.plex.Plex;
+import java.io.File;
+import java.util.Objects;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -9,9 +11,6 @@ import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.generator.ChunkGenerator;
 
-import java.io.File;
-import java.util.Objects;
-
 public class CustomWorld extends WorldCreator
 {
     private static final Plex plugin = Plex.get();

src/main/java/dev/plex/world/FlatChunkGenerator.java

@@ -1,10 +1,9 @@
 package dev.plex.world;
 
+import java.util.Random;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 
-import java.util.Random;
-
 public abstract class FlatChunkGenerator extends CustomChunkGenerator
 {
     public FlatChunkGenerator(int height, BlockPopulator... populators)

src/main/java/dev/plex/world/NoiseChunkGenerator.java

@@ -1,11 +1,10 @@
 package dev.plex.world;
 
+import java.util.Random;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.util.noise.PerlinNoiseGenerator;
 
-import java.util.Random;
-
 public abstract class NoiseChunkGenerator extends CustomChunkGenerator
 {
     private final NoiseOptions options;

src/main/java/dev/plex/world/OctaveChunkGenerator.java

@@ -1,11 +1,10 @@
 package dev.plex.world;
 
+import java.util.Random;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.util.noise.PerlinOctaveGenerator;
 
-import java.util.Random;
-
 public abstract class OctaveChunkGenerator extends CustomChunkGenerator
 {
     private final OctaveOptions options;