diff --git a/src/main/java/dev/plex/Plex.java b/src/main/java/dev/plex/Plex.java index a7ad4bb..f99df2c 100644 --- a/src/main/java/dev/plex/Plex.java +++ b/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 diff --git a/src/main/java/dev/plex/admin/Admin.java b/src/main/java/dev/plex/admin/Admin.java index a91525a..81ee553 100644 --- a/src/main/java/dev/plex/admin/Admin.java +++ b/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 diff --git a/src/main/java/dev/plex/admin/AdminList.java b/src/main/java/dev/plex/admin/AdminList.java index 1918d81..95fcfa8 100644 --- a/src/main/java/dev/plex/admin/AdminList.java +++ b/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; diff --git a/src/main/java/dev/plex/banning/Ban.java b/src/main/java/dev/plex/banning/Ban.java index 4684e1a..b5e26db 100644 --- a/src/main/java/dev/plex/banning/Ban.java +++ b/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) diff --git a/src/main/java/dev/plex/banning/BanManager.java b/src/main/java/dev/plex/banning/BanManager.java index 3d22699..c65d4d2 100644 --- a/src/main/java/dev/plex/banning/BanManager.java +++ b/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; diff --git a/src/main/java/dev/plex/cache/DataUtils.java b/src/main/java/dev/plex/cache/DataUtils.java index ac18626..29d17de 100644 --- a/src/main/java/dev/plex/cache/DataUtils.java +++ b/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 { diff --git a/src/main/java/dev/plex/cache/MongoPlayerData.java b/src/main/java/dev/plex/cache/MongoPlayerData.java index 42bbacd..e03343d 100644 --- a/src/main/java/dev/plex/cache/MongoPlayerData.java +++ b/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 diff --git a/src/main/java/dev/plex/cache/PlayerCache.java b/src/main/java/dev/plex/cache/PlayerCache.java index 8f5f396..6b39fa3 100644 --- a/src/main/java/dev/plex/cache/PlayerCache.java +++ b/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; diff --git a/src/main/java/dev/plex/cache/SQLPlayerData.java b/src/main/java/dev/plex/cache/SQLPlayerData.java index f9ae14a..3925d46 100644 --- a/src/main/java/dev/plex/cache/SQLPlayerData.java +++ b/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; diff --git a/src/main/java/dev/plex/command/annotation/CommandPermissions.java b/src/main/java/dev/plex/command/annotation/CommandPermissions.java index b7bd672..f0f6890 100644 --- a/src/main/java/dev/plex/command/annotation/CommandPermissions.java +++ b/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; diff --git a/src/main/java/dev/plex/command/impl/AdminCMD.java b/src/main/java/dev/plex/command/impl/AdminCMD.java index 748f81f..adff855 100644 --- a/src/main/java/dev/plex/command/impl/AdminCMD.java +++ b/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 = "/ [player] [rank]", aliases = "saconfig,slconfig,adminconfig,adminmanage", description = "Manage all admins") public class AdminCMD extends PlexCommand diff --git a/src/main/java/dev/plex/command/impl/AdminworldCMD.java b/src/main/java/dev/plex/command/impl/AdminworldCMD.java index 8208d59..eec0615 100644 --- a/src/main/java/dev/plex/command/impl/AdminworldCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/AdventureCMD.java b/src/main/java/dev/plex/command/impl/AdventureCMD.java index cb3cc95..ab444d5 100644 --- a/src/main/java/dev/plex/command/impl/AdventureCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/BanCMD.java b/src/main/java/dev/plex/command/impl/BanCMD.java index 8c75802..64dc482 100644 --- a/src/main/java/dev/plex/command/impl/BanCMD.java +++ b/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 = "/ [reason]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online") @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.ANY) diff --git a/src/main/java/dev/plex/command/impl/CreativeCMD.java b/src/main/java/dev/plex/command/impl/CreativeCMD.java index 83272d2..990ba61 100644 --- a/src/main/java/dev/plex/command/impl/CreativeCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/FlatlandsCMD.java b/src/main/java/dev/plex/command/impl/FlatlandsCMD.java index d6fbc84..555d437 100644 --- a/src/main/java/dev/plex/command/impl/FlatlandsCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/FreezeCMD.java b/src/main/java/dev/plex/command/impl/FreezeCMD.java index 31f13a9..1a1ab61 100644 --- a/src/main/java/dev/plex/command/impl/FreezeCMD.java +++ b/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 = "/ ") @CommandPermissions(level = Rank.ADMIN) diff --git a/src/main/java/dev/plex/command/impl/ListCMD.java b/src/main/java/dev/plex/command/impl/ListCMD.java index 60038fb..5517be6 100644 --- a/src/main/java/dev/plex/command/impl/ListCMD.java +++ b/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 = "/ ") @CommandPermissions(level = Rank.OP) public class ListCMD extends PlexCommand diff --git a/src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java b/src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java index 8b68661..cd5a426 100644 --- a/src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/NameHistoryCMD.java b/src/main/java/dev/plex/command/impl/NameHistoryCMD.java index 02d3d4d..3ca9c59 100644 --- a/src/main/java/dev/plex/command/impl/NameHistoryCMD.java +++ b/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 = "/ ", aliases = "nh") @CommandPermissions(level = Rank.OP) public class NameHistoryCMD extends PlexCommand diff --git a/src/main/java/dev/plex/command/impl/OpAllCMD.java b/src/main/java/dev/plex/command/impl/OpAllCMD.java index 79bffd3..85ea991 100644 --- a/src/main/java/dev/plex/command/impl/OpAllCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/OpCMD.java b/src/main/java/dev/plex/command/impl/OpCMD.java index e97970e..ea9eecf 100644 --- a/src/main/java/dev/plex/command/impl/OpCMD.java +++ b/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 = "/ ") @CommandPermissions(level = Rank.OP) public class OpCMD extends PlexCommand diff --git a/src/main/java/dev/plex/command/impl/PlexCMD.java b/src/main/java/dev/plex/command/impl/PlexCMD.java index ede82b8..948d963 100644 --- a/src/main/java/dev/plex/command/impl/PlexCMD.java +++ b/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 = "/ [reload]", aliases = "plexhelp", description = "Show information about Plex or reload it") public class PlexCMD extends PlexCommand { diff --git a/src/main/java/dev/plex/command/impl/PunishmentsCMD.java b/src/main/java/dev/plex/command/impl/PunishmentsCMD.java index 1e318e1..ab7c246 100644 --- a/src/main/java/dev/plex/command/impl/PunishmentsCMD.java +++ b/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 = "/ [player]", description = "Opens the Punishments GUI", aliases = "punishlist,punishes") @CommandPermissions(level = Rank.ADMIN, source = RequiredCommandSource.IN_GAME) public class PunishmentsCMD extends PlexCommand diff --git a/src/main/java/dev/plex/command/impl/RankCMD.java b/src/main/java/dev/plex/command/impl/RankCMD.java index 53aa6d9..23ea4e9 100644 --- a/src/main/java/dev/plex/command/impl/RankCMD.java +++ b/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) diff --git a/src/main/java/dev/plex/command/impl/SpectatorCMD.java b/src/main/java/dev/plex/command/impl/SpectatorCMD.java index 1f2ae33..b635e90 100644 --- a/src/main/java/dev/plex/command/impl/SpectatorCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/SurvivalCMD.java b/src/main/java/dev/plex/command/impl/SurvivalCMD.java index e195f91..3d61fb4 100644 --- a/src/main/java/dev/plex/command/impl/SurvivalCMD.java +++ b/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 diff --git a/src/main/java/dev/plex/command/impl/WorldCMD.java b/src/main/java/dev/plex/command/impl/WorldCMD.java index 68fccd8..21b1b0f 100644 --- a/src/main/java/dev/plex/command/impl/WorldCMD.java +++ b/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 = "/ ") public class WorldCMD extends PlexCommand diff --git a/src/main/java/dev/plex/config/Config.java b/src/main/java/dev/plex/config/Config.java index 3ef4ae6..9f940d4 100644 --- a/src/main/java/dev/plex/config/Config.java +++ b/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 { diff --git a/src/main/java/dev/plex/event/PunishedPlayerEvent.java b/src/main/java/dev/plex/event/PunishedPlayerEvent.java index 73646f5..89a277b 100644 --- a/src/main/java/dev/plex/event/PunishedPlayerEvent.java +++ b/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 { diff --git a/src/main/java/dev/plex/handlers/CommandHandler.java b/src/main/java/dev/plex/handlers/CommandHandler.java index 97494fb..d8d91df 100644 --- a/src/main/java/dev/plex/handlers/CommandHandler.java +++ b/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 diff --git a/src/main/java/dev/plex/handlers/ListenerHandler.java b/src/main/java/dev/plex/handlers/ListenerHandler.java index a236d5f..a8fd128 100644 --- a/src/main/java/dev/plex/handlers/ListenerHandler.java +++ b/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 diff --git a/src/main/java/dev/plex/listener/impl/AdminListener.java b/src/main/java/dev/plex/listener/impl/AdminListener.java index ef88bf5..b2efc6b 100644 --- a/src/main/java/dev/plex/listener/impl/AdminListener.java +++ b/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 diff --git a/src/main/java/dev/plex/listener/impl/ChatListener.java b/src/main/java/dev/plex/listener/impl/ChatListener.java index 5f94ab8..96bb7f2 100644 --- a/src/main/java/dev/plex/listener/impl/ChatListener.java +++ b/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; diff --git a/src/main/java/dev/plex/listener/impl/LoginListener.java b/src/main/java/dev/plex/listener/impl/LoginListener.java index 3b95e4e..63d9f73 100644 --- a/src/main/java/dev/plex/listener/impl/LoginListener.java +++ b/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; diff --git a/src/main/java/dev/plex/listener/impl/PlayerListener.java b/src/main/java/dev/plex/listener/impl/PlayerListener.java index 5f7f9e0..74f4408 100644 --- a/src/main/java/dev/plex/listener/impl/PlayerListener.java +++ b/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; diff --git a/src/main/java/dev/plex/listener/impl/WorldListener.java b/src/main/java/dev/plex/listener/impl/WorldListener.java index e781321..4ace4aa 100644 --- a/src/main/java/dev/plex/listener/impl/WorldListener.java +++ b/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 diff --git a/src/main/java/dev/plex/menu/PunishedPlayerMenu.java b/src/main/java/dev/plex/menu/PunishedPlayerMenu.java index 40c96e0..94f99d5 100644 --- a/src/main/java/dev/plex/menu/PunishedPlayerMenu.java +++ b/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; diff --git a/src/main/java/dev/plex/menu/PunishmentMenu.java b/src/main/java/dev/plex/menu/PunishmentMenu.java index b4be0b3..80f17dc 100644 --- a/src/main/java/dev/plex/menu/PunishmentMenu.java +++ b/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 { diff --git a/src/main/java/dev/plex/player/PlexPlayer.java b/src/main/java/dev/plex/player/PlexPlayer.java index 566417b..0658643 100644 --- a/src/main/java/dev/plex/player/PlexPlayer.java +++ b/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 diff --git a/src/main/java/dev/plex/player/PunishedPlayer.java b/src/main/java/dev/plex/player/PunishedPlayer.java index 66fed36..eaba12a 100644 --- a/src/main/java/dev/plex/player/PunishedPlayer.java +++ b/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 diff --git a/src/main/java/dev/plex/punishment/Punishment.java b/src/main/java/dev/plex/punishment/Punishment.java index b67894b..c8d2adc 100644 --- a/src/main/java/dev/plex/punishment/Punishment.java +++ b/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 diff --git a/src/main/java/dev/plex/punishment/PunishmentManager.java b/src/main/java/dev/plex/punishment/PunishmentManager.java index 00feeb8..bd7a2ad 100644 --- a/src/main/java/dev/plex/punishment/PunishmentManager.java +++ b/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 { diff --git a/src/main/java/dev/plex/rank/RankManager.java b/src/main/java/dev/plex/rank/RankManager.java index fc838f5..8e7f4b8 100644 --- a/src/main/java/dev/plex/rank/RankManager.java +++ b/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 { diff --git a/src/main/java/dev/plex/rank/enums/Rank.java b/src/main/java/dev/plex/rank/enums/Rank.java index d605b9c..88b805c 100644 --- a/src/main/java/dev/plex/rank/enums/Rank.java +++ b/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 { diff --git a/src/main/java/dev/plex/services/ServiceManager.java b/src/main/java/dev/plex/services/ServiceManager.java index bd0f37b..0ee7458 100644 --- a/src/main/java/dev/plex/services/ServiceManager.java +++ b/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 services = Lists.newArrayList(); diff --git a/src/main/java/dev/plex/services/impl/BanService.java b/src/main/java/dev/plex/services/impl/BanService.java index bb4394d..7d8065e 100644 --- a/src/main/java/dev/plex/services/impl/BanService.java +++ b/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 { diff --git a/src/main/java/dev/plex/storage/SQLConnection.java b/src/main/java/dev/plex/storage/SQLConnection.java index c56e744..766c85b 100644 --- a/src/main/java/dev/plex/storage/SQLConnection.java +++ b/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; diff --git a/src/main/java/dev/plex/util/MojangUtils.java b/src/main/java/dev/plex/util/MojangUtils.java index cde0375..350726a 100644 --- a/src/main/java/dev/plex/util/MojangUtils.java +++ b/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) diff --git a/src/main/java/dev/plex/util/PlexUtils.java b/src/main/java/dev/plex/util/PlexUtils.java index 795fe9b..41e1f78 100644 --- a/src/main/java/dev/plex/util/PlexUtils.java +++ b/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 CHAT_COLOR_NAMES; diff --git a/src/main/java/dev/plex/world/ConfigurationChunkGenerator.java b/src/main/java/dev/plex/world/ConfigurationChunkGenerator.java index 0602e6b..a701916 100644 --- a/src/main/java/dev/plex/world/ConfigurationChunkGenerator.java +++ b/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(); diff --git a/src/main/java/dev/plex/world/CustomChunkGenerator.java b/src/main/java/dev/plex/world/CustomChunkGenerator.java index a7656f3..1d5d496 100644 --- a/src/main/java/dev/plex/world/CustomChunkGenerator.java +++ b/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 { diff --git a/src/main/java/dev/plex/world/CustomWorld.java b/src/main/java/dev/plex/world/CustomWorld.java index 179b67f..f637311 100644 --- a/src/main/java/dev/plex/world/CustomWorld.java +++ b/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(); diff --git a/src/main/java/dev/plex/world/FlatChunkGenerator.java b/src/main/java/dev/plex/world/FlatChunkGenerator.java index 954591d..68ad9f2 100644 --- a/src/main/java/dev/plex/world/FlatChunkGenerator.java +++ b/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) diff --git a/src/main/java/dev/plex/world/NoiseChunkGenerator.java b/src/main/java/dev/plex/world/NoiseChunkGenerator.java index c6c7935..8b38451 100644 --- a/src/main/java/dev/plex/world/NoiseChunkGenerator.java +++ b/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; diff --git a/src/main/java/dev/plex/world/OctaveChunkGenerator.java b/src/main/java/dev/plex/world/OctaveChunkGenerator.java index 5d68dc2..1eed47c 100644 --- a/src/main/java/dev/plex/world/OctaveChunkGenerator.java +++ b/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;