Optimize imports

2026-05-16 22:23:00 +02:00
parent fcc370c353
commit 00147f2a74
93 changed files with 140 additions and 209 deletions
@@ -21,12 +21,12 @@ package de.steamwar.command;

 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.velocitycore.ServerVersion;
-import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.commands.TypeMappers;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;
+import de.steamwar.velocitycore.ServerVersion;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.commands.TypeMappers;
 import lombok.experimental.UtilityClass;

 import java.util.Collection;
@@ -19,8 +19,8 @@

 package de.steamwar.sql;

-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.sql.internal.SQLConfig;
+import de.steamwar.velocitycore.VelocityCore;

 import java.util.logging.Logger;

@@ -22,7 +22,6 @@ package de.steamwar.velocitycore;
 import com.velocitypowered.api.proxy.Player;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Arenaserver;
 import de.steamwar.persistent.Bauserver;
@@ -21,7 +21,6 @@ package de.steamwar.velocitycore;

 import com.velocitypowered.api.network.ProtocolVersion;
 import de.steamwar.sql.GameModeConfig;
-import de.steamwar.sql.SchematicType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

@@ -20,14 +20,14 @@
 package de.steamwar.velocitycore;

 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.velocitycore.network.NetworkSender;
-import de.steamwar.velocitycore.network.handlers.FightInfoHandler;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.network.packets.server.StartingServerPacket;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.IgnoreSystem;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.network.NetworkSender;
+import de.steamwar.velocitycore.network.handlers.FightInfoHandler;
 import net.kyori.adventure.text.event.ClickEvent;

 import java.util.UUID;
@@ -19,11 +19,11 @@

 package de.steamwar.velocitycore.commands;

-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.discord.DiscordBot;

@Linked
 public class AlertCommand extends SWCommand {
@@ -19,19 +19,18 @@

 package de.steamwar.velocitycore.commands;

-import de.steamwar.sql.GameModeConfig;
+import de.steamwar.command.PreviousArguments;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
-import de.steamwar.sql.SchematicType;
+import de.steamwar.messages.Chatter;
+import de.steamwar.messages.PlayerChatter;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.sql.UserPerm;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.ServerVersion;
 import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.command.PreviousArguments;
-import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeMapper;
-import de.steamwar.messages.Chatter;
-import de.steamwar.messages.PlayerChatter;
-import de.steamwar.sql.UserPerm;

 import java.io.File;
 import java.io.IOException;
@@ -22,15 +22,14 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Subserver;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.IgnoreSystem;
-import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;

@@ -20,13 +20,12 @@
 package de.steamwar.velocitycore.commands;

 import de.steamwar.command.SWCommand;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
-import de.steamwar.sql.SchematicType;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;

@@ -19,10 +19,10 @@

 package de.steamwar.velocitycore.commands;

-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.PlayerChatter;
+import de.steamwar.velocitycore.listeners.ChatListener;

@Linked
 public class LocalCommand extends SWCommand {
@@ -29,7 +29,6 @@ import de.steamwar.messages.Message;
 import de.steamwar.sql.BannedUserIPs;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SteamwarUser;
-import de.steamwar.sql.UserPerm;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.listeners.IPSanitizer;

@@ -20,7 +20,6 @@
 package de.steamwar.velocitycore.commands;

 import de.steamwar.command.SWCommand;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Message;
@@ -19,16 +19,16 @@

 package de.steamwar.velocitycore.commands;

-import java.net.InetSocketAddress;
-import java.util.List;
-
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.EventFight;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.VelocityCore;
+
+import java.net.InetSocketAddress;
+import java.util.List;

 public class ServerSwitchCommand extends SWCommand {

@@ -19,11 +19,11 @@

 package de.steamwar.velocitycore.commands;

-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.listeners.ChatListener;

@Linked
 public class ServerTeamchatCommand extends SWCommand {
@@ -19,11 +19,11 @@

 package de.steamwar.velocitycore.commands;

-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.Node;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.Node;

 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -19,12 +19,12 @@

 package de.steamwar.velocitycore.commands;

-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.listeners.ChatListener;

@Linked
 public class TeamchatCommand extends SWCommand {
@@ -22,18 +22,20 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.*;
-import de.steamwar.velocitycore.util.BauLock;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.persistent.Storage;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.*;
+import de.steamwar.velocitycore.EventStarter;
+import de.steamwar.velocitycore.SubserverSystem;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.util.BauLock;

 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,11 +23,10 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.Punishment;
-import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 import lombok.experimental.UtilityClass;

@@ -19,11 +19,11 @@

 package de.steamwar.velocitycore.commands;

+import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.messages.Chatter;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.discord.util.AuthManager;
-import de.steamwar.command.SWCommand;
-import de.steamwar.messages.Chatter;
 import net.dv8tion.jda.api.entities.User;

 import java.util.Base64;
@@ -19,11 +19,11 @@

 package de.steamwar.velocitycore.discord.channels;

-import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.listeners.ChatListener;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

 import java.util.function.Supplier;
@@ -28,7 +28,6 @@ import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageEditData;

 import java.util.Collections;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 import java.util.function.Supplier;

@@ -19,19 +19,22 @@

 package de.steamwar.velocitycore.discord.listeners;

-import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.discord.channels.DiscordChannel;
 import de.steamwar.sql.NodeData;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.channels.DiscordChannel;
 import dev.dewy.nbt.Nbt;
 import dev.dewy.nbt.tags.collection.CompoundTag;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;

-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -19,10 +19,10 @@

 package de.steamwar.velocitycore.discord.listeners;

+import de.steamwar.sql.Event;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.channels.InteractionReply;
-import de.steamwar.sql.Event;
 import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
@@ -19,9 +19,9 @@

 package de.steamwar.velocitycore.discord.util;

+import de.steamwar.sql.SteamwarUser;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.discord.channels.DiscordChannel;
-import de.steamwar.sql.SteamwarUser;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
@@ -19,14 +19,16 @@

 package de.steamwar.velocitycore.discord.util;

-import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.discord.DiscordBot;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;

-import java.util.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;


@@ -19,13 +19,13 @@

 package de.steamwar.velocitycore.inventory;

-import de.steamwar.messages.Message;
-import de.steamwar.velocitycore.network.NetworkSender;
-import de.steamwar.velocitycore.network.handlers.InventoryCallbackHandler;
 import de.steamwar.messages.Chatter;
+import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.network.packets.server.CloseInventoryPacket;
 import de.steamwar.network.packets.server.InventoryPacket;
+import de.steamwar.velocitycore.network.NetworkSender;
+import de.steamwar.velocitycore.network.handlers.InventoryCallbackHandler;
 import lombok.Getter;
 import lombok.Setter;

@@ -29,7 +29,6 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.ServerInfo;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
@@ -24,9 +24,9 @@ import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.AuditLog;
-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.sql.Session;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.VelocityCore;

 import java.sql.Timestamp;
 import java.time.Instant;
@@ -23,10 +23,10 @@ import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.player.PlayerSettingsChangedEvent;
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.linkage.Linked;
+import de.steamwar.network.packets.server.LocaleInvalidationPacket;
+import de.steamwar.sql.SteamwarUser;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.network.NetworkSender;
-import de.steamwar.sql.SteamwarUser;
-import de.steamwar.network.packets.server.LocaleInvalidationPacket;

@Linked
 public class SettingsChangedListener extends BasicListener {
@@ -26,10 +26,10 @@ import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
-import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.listeners.BasicListener;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.Mod;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.listeners.BasicListener;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -26,10 +26,10 @@ import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.proxy.connection.client.LoginInboundConnection;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import de.steamwar.linkage.Linked;
+import de.steamwar.sql.Mod;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.listeners.BasicListener;
 import de.steamwar.velocitycore.listeners.PluginMessage;
-import de.steamwar.sql.Mod;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import lombok.AllArgsConstructor;
@@ -30,11 +30,11 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import de.steamwar.linkage.Linked;
 import de.steamwar.persistent.Storage;
-import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.listeners.BasicListener;
 import de.steamwar.sql.Mod;
 import de.steamwar.sql.SWException;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.listeners.BasicListener;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -25,9 +25,9 @@ import com.google.gson.JsonParser;
 import com.velocitypowered.api.event.connection.PluginMessageEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
+import de.steamwar.sql.Mod;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.listeners.PluginMessage;
-import de.steamwar.sql.Mod;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -25,8 +25,8 @@ import com.velocitypowered.api.proxy.Player;
 import de.steamwar.linkage.Linked;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.persistent.Builderserver;
-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.persistent.Subserver;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.commands.DevCommand;
 import de.steamwar.velocitycore.listeners.BasicListener;
 import de.steamwar.velocitycore.listeners.PluginMessage;
@@ -20,10 +20,10 @@
 package de.steamwar.velocitycore.network.handlers;

 import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.ExecuteCommandPacket;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.VelocityCore;

@Linked
 public class ExecuteCommandHandler extends PacketHandler {
@@ -22,11 +22,11 @@ package de.steamwar.velocitycore.network.handlers;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import de.steamwar.linkage.Linked;
+import de.steamwar.network.packets.PacketHandler;
+import de.steamwar.network.packets.common.FightInfoPacket;
 import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.velocitycore.network.ServerMetaInfo;
 import de.steamwar.velocitycore.tablist.TablistManager;
-import de.steamwar.network.packets.PacketHandler;
-import de.steamwar.network.packets.common.FightInfoPacket;

 import java.util.HashSet;
 import java.util.Set;
@@ -20,9 +20,9 @@
 package de.steamwar.velocitycore.network.handlers;

 import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.network.ServerMetaInfo;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.ImALobbyPacket;
+import de.steamwar.velocitycore.network.ServerMetaInfo;

@Linked
 public class ImALobbyHandler extends PacketHandler {
@@ -21,15 +21,15 @@ package de.steamwar.velocitycore.network.handlers;

 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.inventory.InvCallback;
-import de.steamwar.velocitycore.inventory.SWInventory;
-import de.steamwar.velocitycore.network.NetworkSender;
-import de.steamwar.velocitycore.network.ServerMetaInfo;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.InventoryCallbackPacket;
 import de.steamwar.network.packets.server.CloseInventoryPacket;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.inventory.InvCallback;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.network.NetworkSender;
+import de.steamwar.velocitycore.network.ServerMetaInfo;

 import java.util.HashMap;
 import java.util.Map;
@@ -20,10 +20,10 @@
 package de.steamwar.velocitycore.network.handlers;

 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.PrepareSchemPacket;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.velocitycore.ArenaMode;