From 36ab0eb10ea2f00e82b6db62bdc3abee6ded27ca Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 15 Oct 2024 18:57:33 -0500 Subject: [PATCH] Cleanup imports --- .../src/main/java/dev/plex/PlexLibraryManager.java | 9 ++++----- .../dev/plex/listener/impl/AntiNukerListener.java | 6 ++---- .../dev/plex/listener/impl/AntiSpamListener.java | 7 ++----- .../java/dev/plex/listener/impl/ChatListener.java | 7 +++---- .../dev/plex/listener/impl/CommandListener.java | 10 ++++------ .../java/dev/plex/listener/impl/MuteListener.java | 3 +-- .../java/dev/plex/listener/impl/PlayerListener.java | 3 --- .../java/dev/plex/listener/impl/ServerListener.java | 4 +--- .../dev/plex/listener/impl/TogglesListener.java | 10 ++++++---- .../java/dev/plex/listener/impl/WorldListener.java | 13 +++++++------ .../main/java/dev/plex/punishment/Punishment.java | 5 ++--- .../main/java/dev/plex/punishment/extra/Note.java | 3 +-- .../dev/plex/services/impl/AutoWipeService.java | 1 - .../java/dev/plex/services/impl/BanService.java | 6 ++---- .../plex/services/impl/CommandBlockerService.java | 5 ++--- .../dev/plex/services/impl/GameRuleService.java | 3 +-- .../java/dev/plex/services/impl/TimingService.java | 5 ++--- 17 files changed, 40 insertions(+), 60 deletions(-) diff --git a/server/src/main/java/dev/plex/PlexLibraryManager.java b/server/src/main/java/dev/plex/PlexLibraryManager.java index 2f2364d..dbb2312 100644 --- a/server/src/main/java/dev/plex/PlexLibraryManager.java +++ b/server/src/main/java/dev/plex/PlexLibraryManager.java @@ -4,11 +4,6 @@ import com.google.gson.Gson; import io.papermc.paper.plugin.loader.PluginClasspathBuilder; import io.papermc.paper.plugin.loader.PluginLoader; import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.RemoteRepository; -import org.jetbrains.annotations.NotNull; - import java.io.File; import java.io.IOException; import java.io.InputStreamReader; @@ -16,6 +11,10 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.stream.Stream; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.repository.RemoteRepository; +import org.jetbrains.annotations.NotNull; public class PlexLibraryManager implements PluginLoader { diff --git a/server/src/main/java/dev/plex/listener/impl/AntiNukerListener.java b/server/src/main/java/dev/plex/listener/impl/AntiNukerListener.java index 9c4f8c6..0ce5332 100644 --- a/server/src/main/java/dev/plex/listener/impl/AntiNukerListener.java +++ b/server/src/main/java/dev/plex/listener/impl/AntiNukerListener.java @@ -1,16 +1,14 @@ package dev.plex.listener.impl; import dev.plex.listener.PlexListener; -import dev.plex.util.PlexUtils; import dev.plex.services.impl.TimingService; -import net.kyori.adventure.text.Component; +import dev.plex.util.PlexUtils; +import java.util.UUID; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; -import java.util.UUID; - public class AntiNukerListener extends PlexListener { @EventHandler(priority = EventPriority.HIGH) diff --git a/server/src/main/java/dev/plex/listener/impl/AntiSpamListener.java b/server/src/main/java/dev/plex/listener/impl/AntiSpamListener.java index 4b87aac..a4a1f50 100644 --- a/server/src/main/java/dev/plex/listener/impl/AntiSpamListener.java +++ b/server/src/main/java/dev/plex/listener/impl/AntiSpamListener.java @@ -1,17 +1,14 @@ package dev.plex.listener.impl; import dev.plex.listener.PlexListener; -import dev.plex.util.PlexUtils; import dev.plex.services.impl.TimingService; +import dev.plex.util.PlexUtils; import io.papermc.paper.event.player.AsyncChatEvent; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; +import java.util.UUID; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import java.util.UUID; - public class AntiSpamListener extends PlexListener { @EventHandler diff --git a/server/src/main/java/dev/plex/listener/impl/ChatListener.java b/server/src/main/java/dev/plex/listener/impl/ChatListener.java index 0567e49..eb87efb 100644 --- a/server/src/main/java/dev/plex/listener/impl/ChatListener.java +++ b/server/src/main/java/dev/plex/listener/impl/ChatListener.java @@ -10,6 +10,9 @@ import dev.plex.util.minimessage.SafeMiniMessage; import dev.plex.util.redis.MessageUtil; import io.papermc.paper.chat.ChatRenderer; import io.papermc.paper.event.player.AsyncChatEvent; +import java.util.UUID; +import java.util.function.BiConsumer; +import java.util.function.Supplier; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextReplacementConfig; @@ -20,10 +23,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.jetbrains.annotations.NotNull; -import java.util.UUID; -import java.util.function.BiConsumer; -import java.util.function.Supplier; - @Toggleable("chat.enabled") public class ChatListener extends PlexListener { diff --git a/server/src/main/java/dev/plex/listener/impl/CommandListener.java b/server/src/main/java/dev/plex/listener/impl/CommandListener.java index 534a7ed..f5e1dc4 100644 --- a/server/src/main/java/dev/plex/listener/impl/CommandListener.java +++ b/server/src/main/java/dev/plex/listener/impl/CommandListener.java @@ -5,9 +5,12 @@ import dev.plex.cache.DataUtils; import dev.plex.command.blocking.BlockedCommand; import dev.plex.listener.PlexListener; import dev.plex.player.PlexPlayer; - import dev.plex.services.impl.CommandBlockerService; import dev.plex.util.PlexLog; +import java.util.Locale; +import java.util.concurrent.atomic.AtomicReference; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.apache.commons.lang3.StringUtils; @@ -17,11 +20,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import java.util.Locale; -import java.util.concurrent.atomic.AtomicReference; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class CommandListener extends PlexListener { @EventHandler(priority = EventPriority.HIGHEST) diff --git a/server/src/main/java/dev/plex/listener/impl/MuteListener.java b/server/src/main/java/dev/plex/listener/impl/MuteListener.java index d9a796c..89222d5 100644 --- a/server/src/main/java/dev/plex/listener/impl/MuteListener.java +++ b/server/src/main/java/dev/plex/listener/impl/MuteListener.java @@ -4,14 +4,13 @@ import dev.plex.listener.PlexListener; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; import io.papermc.paper.event.player.AsyncChatEvent; +import java.util.List; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import java.util.List; - public class MuteListener extends PlexListener { List commands = plugin.commands.getStringList("block_on_mute"); diff --git a/server/src/main/java/dev/plex/listener/impl/PlayerListener.java b/server/src/main/java/dev/plex/listener/impl/PlayerListener.java index 9878f6b..5b2d9d7 100644 --- a/server/src/main/java/dev/plex/listener/impl/PlayerListener.java +++ b/server/src/main/java/dev/plex/listener/impl/PlayerListener.java @@ -7,9 +7,6 @@ import dev.plex.player.PlexPlayer; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; import java.util.List; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.event.ClickEvent; -import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/server/src/main/java/dev/plex/listener/impl/ServerListener.java b/server/src/main/java/dev/plex/listener/impl/ServerListener.java index 3e48276..4366916 100644 --- a/server/src/main/java/dev/plex/listener/impl/ServerListener.java +++ b/server/src/main/java/dev/plex/listener/impl/ServerListener.java @@ -4,13 +4,11 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent; import dev.plex.listener.PlexListener; import dev.plex.util.PlexUtils; import dev.plex.util.RandomUtil; +import java.util.concurrent.atomic.AtomicReference; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; - public class ServerListener extends PlexListener { @EventHandler diff --git a/server/src/main/java/dev/plex/listener/impl/TogglesListener.java b/server/src/main/java/dev/plex/listener/impl/TogglesListener.java index 801770e..475509c 100644 --- a/server/src/main/java/dev/plex/listener/impl/TogglesListener.java +++ b/server/src/main/java/dev/plex/listener/impl/TogglesListener.java @@ -5,6 +5,7 @@ import dev.plex.listener.PlexListener; import dev.plex.util.PlexUtils; import io.papermc.paper.event.player.AsyncChatEvent; import io.papermc.paper.event.player.PrePlayerAttackEntityEvent; +import java.util.List; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.entity.Player; @@ -13,13 +14,14 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockExplodeEvent; import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.entity.*; -import org.bukkit.event.player.PlayerDropItemEvent; +import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.entity.ExplosionPrimeEvent; +import org.bukkit.event.entity.PotionSplashEvent; +import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.projectiles.ProjectileSource; -import java.util.List; - public class TogglesListener extends PlexListener { List commands = plugin.commands.getStringList("block_on_mute"); diff --git a/server/src/main/java/dev/plex/listener/impl/WorldListener.java b/server/src/main/java/dev/plex/listener/impl/WorldListener.java index 49982df..1a915a9 100644 --- a/server/src/main/java/dev/plex/listener/impl/WorldListener.java +++ b/server/src/main/java/dev/plex/listener/impl/WorldListener.java @@ -1,8 +1,8 @@ package dev.plex.listener.impl; import dev.plex.listener.PlexListener; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; +import java.util.Arrays; +import java.util.List; import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.World; @@ -17,10 +17,11 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntitySpawnEvent; -import org.bukkit.event.player.*; - -import java.util.Arrays; -import java.util.List; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerInteractEntityEvent; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerItemDamageEvent; +import org.bukkit.event.player.PlayerTeleportEvent; public class WorldListener extends PlexListener { diff --git a/server/src/main/java/dev/plex/punishment/Punishment.java b/server/src/main/java/dev/plex/punishment/Punishment.java index 1f93a25..d8b1261 100644 --- a/server/src/main/java/dev/plex/punishment/Punishment.java +++ b/server/src/main/java/dev/plex/punishment/Punishment.java @@ -7,14 +7,13 @@ import dev.plex.storage.annotation.SQLTable; import dev.plex.util.PlexUtils; import dev.plex.util.TimeUtils; import dev.plex.util.adapter.ZonedDateTimeAdapter; +import java.time.ZonedDateTime; +import java.util.UUID; import lombok.Getter; import lombok.Setter; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; -import java.time.ZonedDateTime; -import java.util.UUID; - @Getter @Setter @SQLTable("punishments") diff --git a/server/src/main/java/dev/plex/punishment/extra/Note.java b/server/src/main/java/dev/plex/punishment/extra/Note.java index 846502f..987c7aa 100644 --- a/server/src/main/java/dev/plex/punishment/extra/Note.java +++ b/server/src/main/java/dev/plex/punishment/extra/Note.java @@ -4,10 +4,9 @@ import com.google.gson.GsonBuilder; import dev.plex.storage.annotation.NoLimit; import dev.plex.storage.annotation.SQLTable; import dev.plex.util.adapter.ZonedDateTimeAdapter; -import lombok.Data; - import java.time.ZonedDateTime; import java.util.UUID; +import lombok.Data; @Data @SQLTable("notes") diff --git a/server/src/main/java/dev/plex/services/impl/AutoWipeService.java b/server/src/main/java/dev/plex/services/impl/AutoWipeService.java index 2f0f1eb..1f5d661 100644 --- a/server/src/main/java/dev/plex/services/impl/AutoWipeService.java +++ b/server/src/main/java/dev/plex/services/impl/AutoWipeService.java @@ -2,7 +2,6 @@ package dev.plex.services.impl; import dev.plex.Plex; import dev.plex.services.AbstractService; -import dev.plex.util.PlexLog; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import java.util.List; import org.bukkit.Bukkit; diff --git a/server/src/main/java/dev/plex/services/impl/BanService.java b/server/src/main/java/dev/plex/services/impl/BanService.java index 2d587f6..4a8a02d 100644 --- a/server/src/main/java/dev/plex/services/impl/BanService.java +++ b/server/src/main/java/dev/plex/services/impl/BanService.java @@ -2,14 +2,12 @@ package dev.plex.services.impl; import dev.plex.Plex; import dev.plex.services.AbstractService; -import dev.plex.util.TimeUtils; import dev.plex.util.PlexUtils; +import dev.plex.util.TimeUtils; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; -import net.kyori.adventure.text.Component; -import org.bukkit.Bukkit; - import java.time.ZoneId; import java.time.ZonedDateTime; +import org.bukkit.Bukkit; public class BanService extends AbstractService { diff --git a/server/src/main/java/dev/plex/services/impl/CommandBlockerService.java b/server/src/main/java/dev/plex/services/impl/CommandBlockerService.java index 2d7d589..5986a64 100644 --- a/server/src/main/java/dev/plex/services/impl/CommandBlockerService.java +++ b/server/src/main/java/dev/plex/services/impl/CommandBlockerService.java @@ -6,11 +6,10 @@ import dev.plex.services.AbstractService; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; -import lombok.Getter; -import org.bukkit.command.Command; - import java.util.List; import java.util.Locale; +import lombok.Getter; +import org.bukkit.command.Command; public class CommandBlockerService extends AbstractService { diff --git a/server/src/main/java/dev/plex/services/impl/GameRuleService.java b/server/src/main/java/dev/plex/services/impl/GameRuleService.java index c7fe33e..2d2a5c4 100644 --- a/server/src/main/java/dev/plex/services/impl/GameRuleService.java +++ b/server/src/main/java/dev/plex/services/impl/GameRuleService.java @@ -4,11 +4,10 @@ import dev.plex.services.AbstractService; import dev.plex.util.GameRuleUtil; import dev.plex.util.PlexLog; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; +import java.util.Locale; import org.bukkit.Bukkit; import org.bukkit.World; -import java.util.Locale; - public class GameRuleService extends AbstractService { public GameRuleService() diff --git a/server/src/main/java/dev/plex/services/impl/TimingService.java b/server/src/main/java/dev/plex/services/impl/TimingService.java index dc1c3fb..2f9a72b 100644 --- a/server/src/main/java/dev/plex/services/impl/TimingService.java +++ b/server/src/main/java/dev/plex/services/impl/TimingService.java @@ -8,12 +8,11 @@ import dev.plex.services.AbstractService; import dev.plex.util.PlexLog; import dev.plex.util.TimeUtils; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; - import java.util.HashMap; import java.util.Map; import java.util.UUID; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; public class TimingService extends AbstractService {