Compare commits

..

2 Commits

Author SHA1 Message Date
Colbster937
9985223d22 sort imports 2026-01-10 13:06:24 -06:00
Colbster937
b6df47ee2e fix 2026-01-10 12:56:20 -06:00
8 changed files with 23 additions and 33 deletions

View File

@@ -83,13 +83,13 @@ jobs:
with: with:
token: ${{ secrets.MODRINTH_TOKEN }} token: ${{ secrets.MODRINTH_TOKEN }}
project: WfBtRGYI project: WfBtRGYI
version: ${{ steps.dist.output.TAG_NAME }} version: ${{ steps.dist.outputs.TAG_NAME }}
loaders: '["bukkit", "bungeecord", "paper", "purpur", "spigot", "velocity", "waterfall"]' loaders: '["bukkit", "bungeecord", "paper", "purpur", "spigot", "velocity", "waterfall"]'
game-versions: '["1.8.x", "1.9.x", "1.10.x", "1.11.x", "1.12.x", "1.13.x", "1.14.x", "1.15.x", "1.16.x", "1.17.x", "1.18.x", "1.19.x", "1.20.x", "1.21.x"]' game-versions: '["1.8.x", "1.9.x", "1.10.x", "1.11.x", "1.12.x", "1.13.x", "1.14.x", "1.15.x", "1.16.x", "1.17.x", "1.18.x", "1.19.x", "1.20.x", "1.21.x"]'
files: dist/${{ steps.vars.outputs.AFCT }} files: dist/${{ steps.vars.outputs.AFCT }}
primary-file: ${{ steps.vars.outputs.AFCT }} primary-file: ${{ steps.vars.outputs.AFCT }}
name: ${{ steps.dist.outputs.REL_NAME }} name: ${{ steps.dist.outputs.REL_NAME }}
channel: ${{ steps.ghck.outputs.EXISTS == 'true' && 'beta ' || 'release' }} channel: ${{ steps.ghck.outputs.EXISTS == 'true' && 'beta' || 'release' }}
dependencies: |- dependencies: |-
[{ [{
"project_id": "Gtsn3SWv", "project_id": "Gtsn3SWv",

View File

@@ -19,20 +19,17 @@ import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.semver4j.Semver;
import de.marhali.json5.Json5Array; import de.marhali.json5.Json5Array;
import de.marhali.json5.Json5Element; import de.marhali.json5.Json5Element;
import inet.ipaddr.AddressStringException; import inet.ipaddr.AddressStringException;
import inet.ipaddr.IPAddressString; import inet.ipaddr.IPAddressString;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.lax1dude.eaglercraft.backend.server.api.EnumWebSocketHeader; import net.lax1dude.eaglercraft.backend.server.api.EnumWebSocketHeader;
import net.lax1dude.eaglercraft.backend.server.api.IEaglerLoginConnection; import net.lax1dude.eaglercraft.backend.server.api.IEaglerLoginConnection;
import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection; import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection;
import org.semver4j.Semver;
public final class OriginBlacklist { public final class OriginBlacklist {
public static final Semver REQUIRED_API_VER = new Semver("1.0.2"); public static final Semver REQUIRED_API_VER = new Semver("1.0.2");

View File

@@ -6,9 +6,8 @@ import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.semver4j.Semver;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.semver4j.Semver;
public interface IOriginBlacklistPlugin { public interface IOriginBlacklistPlugin {
public String getPluginId(); public String getPluginId();

View File

@@ -5,13 +5,12 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import org.semver4j.Semver;
import org.semver4j.Semver.VersionDiff;
import de.marhali.json5.Json5; import de.marhali.json5.Json5;
import de.marhali.json5.Json5Array; import de.marhali.json5.Json5Array;
import de.marhali.json5.Json5Element; import de.marhali.json5.Json5Element;
import de.marhali.json5.Json5Object; import de.marhali.json5.Json5Object;
import org.semver4j.Semver;
import org.semver4j.Semver.VersionDiff;
public class UpdateChecker { public class UpdateChecker {
private static final Json5 json5 = Json5.builder(builder -> builder.build()); private static final Json5 json5 = Json5.builder(builder -> builder.build());

View File

@@ -5,9 +5,9 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
import xyz.webmc.originblacklist.base.enums.EnumLogLevel; import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent; import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent; 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.IOriginBlacklistPlugin;
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException; import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
import xyz.webmc.originblacklist.base.util.OPlayer;
import xyz.webmc.originblacklist.bukkit.command.OriginBlacklistCommandBukkit; import xyz.webmc.originblacklist.bukkit.command.OriginBlacklistCommandBukkit;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@@ -18,7 +18,11 @@ import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; 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.bukkit.Metrics;
import org.bstats.charts.AdvancedPie; import org.bstats.charts.AdvancedPie;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@@ -32,12 +36,7 @@ import org.bukkit.event.server.ServerListPingEvent;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.CachedServerIcon; import org.bukkit.util.CachedServerIcon;
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;
public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin { public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin {
private boolean papiPlaceholdersEnabled; private boolean papiPlaceholdersEnabled;

View File

@@ -14,10 +14,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; 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.kyori.adventure.text.Component;
import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI; import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
import net.lax1dude.eaglercraft.backend.server.api.bungee.EaglerXServerAPI; 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.ProxyServer;
import net.md_5.bungee.api.ServerPing; import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.connection.ProxiedPlayer; 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.PostLoginEvent;
import net.md_5.bungee.api.event.PreLoginEvent; 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.Listener;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.event.EventPriority; import net.md_5.bungee.event.EventPriority;
import org.bstats.bungeecord.Metrics;
import org.bstats.charts.AdvancedPie;
import org.semver4j.Semver;
@SuppressWarnings({ "deprecation" }) @SuppressWarnings({ "deprecation" })
public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin { public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin {

View File

@@ -15,12 +15,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; 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.google.inject.Inject;
import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.PostOrder;
import com.velocitypowered.api.event.Subscribe; 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.proxy.server.ServerPing;
import com.velocitypowered.api.scheduler.ScheduledTask; import com.velocitypowered.api.scheduler.ScheduledTask;
import com.velocitypowered.api.util.Favicon; import com.velocitypowered.api.util.Favicon;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI; 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.EaglerXServerAPI;
import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftLoginEvent; 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" }) @SuppressWarnings({ "deprecation", "unchecked" })
public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin { public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {

View File

@@ -3,7 +3,6 @@ package xyz.webmc.originblacklist.velocity.command;
import xyz.webmc.originblacklist.base.command.CommandContext; import xyz.webmc.originblacklist.base.command.CommandContext;
import com.velocitypowered.api.command.SimpleCommand.Invocation; import com.velocitypowered.api.command.SimpleCommand.Invocation;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
public class VCommandContext implements CommandContext { public class VCommandContext implements CommandContext {