diff --git a/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java b/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java index f9afd3c..5be3ca2 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java +++ b/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java @@ -19,20 +19,17 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import org.semver4j.Semver; - import de.marhali.json5.Json5Array; import de.marhali.json5.Json5Element; - import inet.ipaddr.AddressStringException; import inet.ipaddr.IPAddressString; - import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.lax1dude.eaglercraft.backend.server.api.EnumWebSocketHeader; import net.lax1dude.eaglercraft.backend.server.api.IEaglerLoginConnection; import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection; +import org.semver4j.Semver; public final class OriginBlacklist { public static final Semver REQUIRED_API_VER = new Semver("1.0.2"); diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.java b/src/main/java/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.java index f15d729..b94e6ae 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.java +++ b/src/main/java/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.java @@ -6,9 +6,8 @@ import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent; import java.util.concurrent.TimeUnit; -import org.semver4j.Semver; - import net.kyori.adventure.text.Component; +import org.semver4j.Semver; public interface IOriginBlacklistPlugin { public String getPluginId(); diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java b/src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java index 5fe2c8b..5fd3f8c 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java +++ b/src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java @@ -5,13 +5,12 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import org.semver4j.Semver; -import org.semver4j.Semver.VersionDiff; - import de.marhali.json5.Json5; import de.marhali.json5.Json5Array; import de.marhali.json5.Json5Element; import de.marhali.json5.Json5Object; +import org.semver4j.Semver; +import org.semver4j.Semver.VersionDiff; public class UpdateChecker { private static final Json5 json5 = Json5.builder(builder -> builder.build()); diff --git a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java index 9c05317..40304c3 100644 --- a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java +++ b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java @@ -5,9 +5,9 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType; import xyz.webmc.originblacklist.base.enums.EnumLogLevel; import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent; import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent; -import xyz.webmc.originblacklist.base.util.OPlayer; import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin; import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException; +import xyz.webmc.originblacklist.base.util.OPlayer; import xyz.webmc.originblacklist.bukkit.command.OriginBlacklistCommandBukkit; import java.awt.image.BufferedImage; @@ -18,7 +18,11 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.semver4j.Semver; +import net.kyori.adventure.text.Component; +import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI; +import net.lax1dude.eaglercraft.backend.server.api.bukkit.EaglerXServerAPI; +import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftLoginEvent; +import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent; import org.bstats.bukkit.Metrics; import org.bstats.charts.AdvancedPie; import org.bukkit.Bukkit; @@ -32,12 +36,7 @@ import org.bukkit.event.server.ServerListPingEvent; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.CachedServerIcon; - -import net.kyori.adventure.text.Component; -import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI; -import net.lax1dude.eaglercraft.backend.server.api.bukkit.EaglerXServerAPI; -import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftLoginEvent; -import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent; +import org.semver4j.Semver; public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin { private boolean papiPlaceholdersEnabled; diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java index a70b7e5..0bd2baa 100644 --- a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java +++ b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java @@ -14,10 +14,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.bstats.bungeecord.Metrics; -import org.bstats.charts.AdvancedPie; -import org.semver4j.Semver; - import net.kyori.adventure.text.Component; import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI; import net.lax1dude.eaglercraft.backend.server.api.bungee.EaglerXServerAPI; @@ -26,13 +22,16 @@ import net.lax1dude.eaglercraft.backend.server.api.bungee.event.EaglercraftMOTDE import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ServerPing; import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.api.event.ProxyPingEvent; import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.event.PreLoginEvent; +import net.md_5.bungee.api.event.ProxyPingEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventPriority; +import org.bstats.bungeecord.Metrics; +import org.bstats.charts.AdvancedPie; +import org.semver4j.Semver; @SuppressWarnings({ "deprecation" }) public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin { diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java index 514842a..3077718 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java @@ -15,12 +15,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.bstats.charts.AdvancedPie; -import org.bstats.velocity.Metrics; -import org.bstats.velocity.Metrics.Factory; -import org.semver4j.Semver; -import org.slf4j.Logger; - import com.google.inject.Inject; import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.Subscribe; @@ -34,12 +28,16 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.ServerPing; import com.velocitypowered.api.scheduler.ScheduledTask; import com.velocitypowered.api.util.Favicon; - import net.kyori.adventure.text.Component; import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI; -import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftMOTDEvent; import net.lax1dude.eaglercraft.backend.server.api.velocity.EaglerXServerAPI; import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftLoginEvent; +import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftMOTDEvent; +import org.bstats.charts.AdvancedPie; +import org.bstats.velocity.Metrics; +import org.bstats.velocity.Metrics.Factory; +import org.semver4j.Semver; +import org.slf4j.Logger; @SuppressWarnings({ "deprecation", "unchecked" }) public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin { diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java b/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java index 1b130a2..6f741b3 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java @@ -3,7 +3,6 @@ package xyz.webmc.originblacklist.velocity.command; import xyz.webmc.originblacklist.base.command.CommandContext; import com.velocitypowered.api.command.SimpleCommand.Invocation; - import net.kyori.adventure.text.minimessage.MiniMessage; public class VCommandContext implements CommandContext {