Optimize imports

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java

@@ -23,7 +23,6 @@ import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
 import org.bukkit.*;

CLI/src/commands/dev/DevCommand.kt

@@ -6,7 +6,6 @@ import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.help
 import com.github.ajalt.clikt.parameters.arguments.multiple
-import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.defaultLazy
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.help

CLI/src/db/Database.kt

@@ -13,7 +13,7 @@ import org.jetbrains.exposed.v1.jdbc.JdbcTransaction
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import java.io.File
 import java.sql.ResultSet
-import java.util.Properties
+import java.util.*
 
 object Database {
     lateinit var host: String

CommandFramework/src/de/steamwar/command/CommandMetaData.java

@@ -19,7 +19,10 @@
 
 package de.steamwar.command;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 public @interface CommandMetaData {
 

CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommand.java

@@ -21,7 +21,6 @@ package de.steamwar.command;
 
 import de.steamwar.command.dto.ExecutionIdentifier;
 import de.steamwar.command.dto.TestSWCommand;
-import de.steamwar.command.dto.TestTypeMapper;
 
 import java.util.Collections;
 

CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java

@@ -20,8 +20,12 @@
 package de.steamwar.network;
 
 import de.steamwar.network.packets.NetworkPacket;
-import de.steamwar.network.packets.client.*;
+import de.steamwar.network.packets.client.ExecuteCommandPacket;
-import de.steamwar.network.packets.common.*;
+import de.steamwar.network.packets.client.ImALobbyPacket;
+import de.steamwar.network.packets.client.InventoryCallbackPacket;
+import de.steamwar.network.packets.client.PrepareSchemPacket;
+import de.steamwar.network.packets.common.FightEndsPacket;
+import de.steamwar.network.packets.common.FightInfoPacket;
 import de.steamwar.network.packets.server.*;
 import lombok.SneakyThrows;
 
@@ -30,7 +34,7 @@ import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.List;
 
-import static de.steamwar.RandomGenerator.*;
+import static de.steamwar.RandomGenerator.generateRandom;
 
 public class AllPackets {
 

CommonCore/Network/testsrc/de/steamwar/network/PacketHandlerTest.java

@@ -25,8 +25,9 @@ import org.junit.Test;
 
 import java.lang.reflect.InvocationTargetException;
 
-import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 
 public class PacketHandlerTest {
 

CommonCore/Network/testsrc/de/steamwar/network/PacketTest.java

@@ -22,8 +22,8 @@ package de.steamwar.network;
 import de.steamwar.network.packets.NetworkPacket;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.equalTo;
 
 public class PacketTest {
 

CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.kt

@@ -20,14 +20,10 @@
 package de.steamwar.sql
 
 import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.ReferenceOption
+import org.jetbrains.exposed.v1.core.*
-import org.jetbrains.exposed.v1.core.SortOrder
-import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
 import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.core.neq
 import org.jetbrains.exposed.v1.dao.CompositeEntity
 import org.jetbrains.exposed.v1.dao.CompositeEntityClass
 import org.jetbrains.exposed.v1.javatime.timestamp

CommonCore/SQL/src/de/steamwar/sql/Leaderboard.kt

@@ -20,17 +20,12 @@
 package de.steamwar.sql
 
 import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.core.*
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.count
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
 import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.core.lessSubQuery
 import org.jetbrains.exposed.v1.dao.CompositeEntity
 import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.dao.flushCache
 import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
 import org.jetbrains.exposed.v1.javatime.timestamp
 import org.jetbrains.exposed.v1.jdbc.select

CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt

@@ -27,7 +27,6 @@ import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.dao.CompositeEntity
 import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.jdbc.insert
 
 object PersonalKitTable: CompositeIdTable("PersonalKit") {
     val userId = reference("UserId", SteamwarUserTable)

CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt

@@ -23,7 +23,6 @@ import org.intellij.lang.annotations.Language
 import org.jetbrains.exposed.v1.core.ColumnType
 import org.jetbrains.exposed.v1.core.Expression
 import org.jetbrains.exposed.v1.core.ResultRow
-import org.jetbrains.exposed.v1.core.StdOutSqlLogger
 import org.jetbrains.exposed.v1.core.statements.StatementType
 import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.fightsystem.listener;
 
-import de.steamwar.Reflection;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;

LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java

@@ -23,7 +23,6 @@ import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.util.LeaderboardManager;
-import de.steamwar.sql.Leaderboard;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

LobbySystem/src/de/steamwar/lobby/particle/ParticleInventory.java

@@ -28,7 +28,10 @@ import de.steamwar.lobby.particle.particles.custom.CustomPlayerParticle;
 import de.steamwar.lobby.particle.particles.custom.CustomTeamParticle;
 import de.steamwar.lobby.special.easter.EggHunt;
 import de.steamwar.lobby.util.LobbyPlayer;
-import de.steamwar.sql.*;
+import de.steamwar.sql.Event;
+import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.TeamTeilnahme;
+import de.steamwar.sql.UserConfig;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

LobbySystem/src/de/steamwar/lobby/particle/ParticleRequirement.java

@@ -22,7 +22,10 @@ package de.steamwar.lobby.particle;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.special.easter.EggDifficulty;
 import de.steamwar.lobby.special.easter.EggHunt;
-import de.steamwar.sql.*;
+import de.steamwar.sql.Event;
+import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.Team;
+import de.steamwar.sql.UserPerm;
 import org.bukkit.entity.Player;
 
 import java.util.HashSet;

LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntCommand.java

@@ -24,6 +24,7 @@ import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.sql.UserConfig;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.util.Collections;

MissileWars/src/de/steamwar/misslewars/FightScoreboard.java

@@ -27,11 +27,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scoreboard.DisplaySlot;
-import org.bukkit.scoreboard.Objective;
 import org.bukkit.scoreboard.Scoreboard;
 
-import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Objects;
 

MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java

@@ -21,7 +21,6 @@ package de.steamwar.misslewars.countdowns;
 
 import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.*;
-import de.steamwar.misslewars.listener.JoinListener;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitTask;
 

MissileWars/src/de/steamwar/misslewars/items/Missile.java

@@ -30,8 +30,6 @@ import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.transform.AffineTransform;
 import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.util.SideEffect;
-import com.sk89q.worldedit.util.SideEffectSet;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import de.steamwar.misslewars.MissileWars;

MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java

@@ -22,23 +22,18 @@ package de.steamwar.misslewars.listener;
 import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
-import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.entity.ItemDespawnEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerPickupArrowEvent;
 
 import java.util.EnumSet;
-import java.util.Map;
 import java.util.Objects;
 
 @Linked

MissileWars/src/de/steamwar/misslewars/scripts/ScriptedItem.java

@@ -24,7 +24,6 @@ import de.steamwar.misslewars.scripts.utils.JsonUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.LingeringPotion;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;

MissileWars/src/de/steamwar/misslewars/scripts/implemented/CooldownScript.java

@@ -26,7 +26,6 @@ import de.steamwar.misslewars.scripts.RunnableScript;
 import de.steamwar.misslewars.scripts.RunnableScriptEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 
 public class CooldownScript implements RunnableScript {
 

SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java

@@ -24,7 +24,6 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
-import de.steamwar.core.Core;
 import de.steamwar.sql.GameModeConfig;
 import lombok.Getter;
 import lombok.ToString;

SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.schematicsystem.autocheck;
 
-import de.steamwar.core.Core;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.GameModeConfig;
 import lombok.Builder;

SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java

@@ -21,7 +21,6 @@ package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.inventory.SWInventory;
-import de.steamwar.inventory.SWItem;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.client.PrepareSchemPacket;
 import de.steamwar.providers.BauServerInfo;

SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java

@@ -27,7 +27,6 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
-import de.steamwar.core.Core;
 import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;

TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt

@@ -24,7 +24,6 @@ import de.steamwar.command.TypeValidator
 import de.steamwar.tntleague.colorByTeam
 import de.steamwar.tntleague.config.TNTLeagueConfig
 import de.steamwar.tntleague.game.TNTLeagueGame
-import de.steamwar.tntleague.message
 import net.md_5.bungee.api.chat.ClickEvent
 import org.bukkit.entity.Player
 

TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueWorldConfig.kt

@@ -20,14 +20,11 @@
 package de.steamwar.tntleague.config
 
 import de.steamwar.tntleague.plugin
-import de.steamwar.kotlin.util.Area
-import net.kyori.adventure.text.Component
 import org.bukkit.Bukkit
 import org.bukkit.Location
 import org.bukkit.Material
 import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.configuration.file.YamlConfiguration
-import org.bukkit.entity.WanderingTrader
 import java.io.File
 import kotlin.math.abs
 import kotlin.properties.Delegates

TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt

@@ -19,7 +19,6 @@
 
 package de.steamwar.tntleague.events
 
-import de.steamwar.message.SubMessage
 import de.steamwar.tntleague.config.TNTLeagueWorldConfig
 import de.steamwar.tntleague.game.TNTLeagueGame
 import de.steamwar.tntleague.game.TNTLeagueTeam

TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt

@@ -35,7 +35,6 @@ import org.bukkit.event.player.PlayerAttemptPickupItemEvent
 import org.bukkit.event.player.PlayerInteractEntityEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerMoveEvent
-import org.bukkit.event.player.*
 import org.bukkit.persistence.PersistentDataType
 
 object IngameListener : Listener {

TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt

@@ -26,7 +26,10 @@ import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDamageEvent
 import org.bukkit.event.inventory.InventoryClickEvent
-import org.bukkit.event.player.*
+import org.bukkit.event.player.PlayerDropItemEvent
+import org.bukkit.event.player.PlayerInteractEntityEvent
+import org.bukkit.event.player.PlayerInteractEvent
+import org.bukkit.event.player.PlayerJoinEvent
 
 object LobbyListener: Listener {
 

TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt

@@ -20,7 +20,6 @@
 package de.steamwar.tntleague.game
 
 import de.steamwar.kotlin.util.Area
-import de.steamwar.message.SubMessage
 import de.steamwar.network.NetworkSender
 import de.steamwar.network.packets.common.FightInfoPacket
 import de.steamwar.scoreboard.SWScoreboard
@@ -48,7 +47,6 @@ import org.bukkit.inventory.ItemStack
 import org.bukkit.scheduler.BukkitTask
 import java.sql.Timestamp
 import java.time.Instant
-import kotlin.random.Random
 
 object TNTLeagueGame {
     var state: GameState = GameState.LOBBY

TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt

@@ -25,10 +25,7 @@ import de.steamwar.tntleague.config.TNTLeagueConfig
 import de.steamwar.tntleague.inventory.DealerInventory.Companion.buyItem
 import de.steamwar.tntleague.inventory.DealerInventory.Companion.itemsByCategory
 import de.steamwar.tntleague.message
-import net.kyori.adventure.text.Component
-import org.bukkit.Bukkit
 import org.bukkit.entity.Player
-import org.bukkit.inventory.Inventory
 
 class CategoryInventory(player: Player, category: TNTLeagueConfig.ItemCategory): KotlinInventory(player) {
     override fun createInventory() = SWInventory(player, 9 * 6, message.parse("DEALER", player))

TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt

@@ -34,7 +34,6 @@ import org.bukkit.NamespacedKey
 import org.bukkit.Sound
 import org.bukkit.entity.Player
 import org.bukkit.event.inventory.InventoryClickEvent
-import org.bukkit.inventory.Inventory
 import org.bukkit.inventory.ItemStack
 import org.bukkit.persistence.PersistentDataType
 import java.util.*

TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt

@@ -25,7 +25,6 @@ import de.steamwar.tntleague.game.TNTLeagueGame
 import de.steamwar.tntleague.game.TNTLeagueTeam
 import de.steamwar.tntleague.message
 import org.bukkit.entity.Player
-import kotlin.collections.HashMap
 
 data class TNTLeagueScoreboard(val p: Player): ScoreboardCallback {
     override fun getData(): HashMap<String, Int> {

Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java

@@ -19,18 +19,14 @@
 
 package de.steamwar.teamserver.listener;
 
-import de.steamwar.core.Core;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.teamserver.Builder;
 import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.Switch;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java

@@ -27,13 +27,15 @@ import de.steamwar.towerrun.game.TowerRunPlayer;
 import de.steamwar.towerrun.state.GameState;
 import de.steamwar.towerrun.state.GameStateBukkitListener;
 import de.steamwar.towerrun.state.GameStates;
-import lombok.val;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
 
 import java.util.EnumSet;
 

TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java

@@ -39,7 +39,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 
 import java.util.EnumSet;
-import java.util.HashMap;
 
 @Linked
 public class LobbyListener extends GameStateBukkitListener {

TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java

@@ -24,7 +24,7 @@ import de.steamwar.towerrun.state.GameStates;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.*;
+import java.util.EnumSet;
 
 @Getter
 public abstract class WinCondition extends GameStateBukkitListener {

VelocityCore/src/de/steamwar/command/TypeUtils.java

@@ -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;

VelocityCore/src/de/steamwar/sql/SQLConfigImpl.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java

@@ -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 {

VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java

@@ -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 {

VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java

@@ -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 {
 

VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java

@@ -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 {

VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java

@@ -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 {

VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java

@@ -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;
 
 

VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java

@@ -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 {

VelocityCore/src/de/steamwar/velocitycore/mods/FML.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java

@@ -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;
 

VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java

@@ -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 {

VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java

@@ -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 {

VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java

@@ -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;

VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java

@@ -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;

WebsiteBackend/src/de/steamwar/Application.kt

@@ -20,10 +20,10 @@
 package de.steamwar
 
 import de.steamwar.plugins.configurePlugins
-import io.ktor.server.application.*
-import io.ktor.server.engine.*
 import de.steamwar.routes.configureRoutes
 import de.steamwar.sql.SteamwarUser
+import io.ktor.server.application.*
+import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable

WebsiteBackend/src/de/steamwar/data/SkinCache.kt

@@ -27,7 +27,8 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.utils.io.jvm.javaio.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.cbor.Cbor

WebsiteBackend/src/de/steamwar/plugins/Auth.kt

@@ -21,7 +21,6 @@ package de.steamwar.plugins
 
 import de.steamwar.sql.SWException
 import de.steamwar.sql.SteamwarUser
-import de.steamwar.sql.Token
 import de.steamwar.sql.UserPerm
 import io.ktor.http.*
 import io.ktor.server.application.*
@@ -29,8 +28,6 @@ import io.ktor.server.application.hooks.*
 import io.ktor.server.auth.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
-import io.ktor.server.sessions.sessions
-import io.ktor.util.*
 import kotlinx.serialization.Serializable
 
 @Serializable

WebsiteBackend/src/de/steamwar/plugins/Plugins.kt

@@ -21,23 +21,15 @@ package de.steamwar.plugins
 
 import de.steamwar.config
 import de.steamwar.sql.SteamwarUser
-import de.steamwar.sql.Token
-import de.steamwar.util.TokenType
-import de.steamwar.util.isValid
-import de.steamwar.util.type
 import io.ktor.http.*
-import io.ktor.http.auth.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.auth.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.plugins.ratelimit.*
-import io.ktor.server.response.respond
+import io.ktor.server.response.*
-import io.ktor.server.sessions.SessionTransportTransformerEncrypt
+import io.ktor.server.sessions.*
-import io.ktor.server.sessions.Sessions
-import io.ktor.server.sessions.cookie
-import io.ktor.server.sessions.directorySessionStorage
 import kotlinx.serialization.json.Json
 import java.io.File
 import kotlin.time.Duration.Companion.seconds

WebsiteBackend/src/de/steamwar/plugins/SteamWar.kt

@@ -22,7 +22,7 @@ package de.steamwar.plugins
 import de.steamwar.routes.catchException
 import de.steamwar.sql.SteamwarUser
 import io.ktor.server.request.*
-import java.util.UUID
+import java.util.*
 
 fun ApplicationRequest.getUser(key: String = "id"): SteamwarUser? {
     return SteamwarUser.get(call.parameters[key]?.let { catchException { UUID.fromString(it) } } ?: return null)

WebsiteBackend/src/de/steamwar/routes/AuditLog.kt

@@ -25,23 +25,11 @@ import de.steamwar.sql.AuditLogTable
 import de.steamwar.sql.SteamwarUserTable
 import de.steamwar.sql.UserPerm
 import de.steamwar.sql.internal.useDb
-import io.ktor.server.application.call
+import io.ktor.server.application.*
-import io.ktor.server.application.install
+import io.ktor.server.response.*
-import io.ktor.server.response.respond
+import io.ktor.server.routing.*
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import io.ktor.server.routing.route
 import kotlinx.serialization.Serializable
-import org.jetbrains.exposed.v1.core.Alias
+import org.jetbrains.exposed.v1.core.*
-import org.jetbrains.exposed.v1.core.JoinType
-import org.jetbrains.exposed.v1.core.SortOrder
-import org.jetbrains.exposed.v1.core.alias
-import org.jetbrains.exposed.v1.core.greater
-import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.core.isNull
-import org.jetbrains.exposed.v1.core.less
-import org.jetbrains.exposed.v1.core.like
-import org.jetbrains.exposed.v1.core.or
 import org.jetbrains.exposed.v1.jdbc.Query
 import org.jetbrains.exposed.v1.jdbc.andWhere
 import org.jetbrains.exposed.v1.jdbc.select

WebsiteBackend/src/de/steamwar/routes/Auth.kt

@@ -22,21 +22,18 @@ package de.steamwar.routes
 import de.steamwar.ResponseError
 import de.steamwar.plugins.SWUserSession
 import de.steamwar.sql.SteamwarUser
-import io.ktor.client.HttpClient
+import io.ktor.client.*
-import io.ktor.client.engine.java.Java
+import io.ktor.client.engine.java.*
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.client.request.get
+import io.ktor.client.request.*
-import io.ktor.client.request.headers
+import io.ktor.client.statement.*
-import io.ktor.client.statement.bodyAsText
 import io.ktor.http.*
-import io.ktor.serialization.kotlinx.json.json
+import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import io.ktor.server.sessions.clear
+import io.ktor.server.sessions.*
-import io.ktor.server.sessions.sessions
-import io.ktor.server.sessions.set
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject

WebsiteBackend/src/de/steamwar/routes/Data.kt

@@ -23,11 +23,7 @@ import de.steamwar.ResponseError
 import de.steamwar.data.getCachedSkin
 import de.steamwar.plugins.SWAuthPrincipal
 import de.steamwar.plugins.SWPermissionCheck
-import de.steamwar.sql.SchematicType
+import de.steamwar.sql.*
-import de.steamwar.sql.SteamwarUser
-import de.steamwar.sql.SteamwarUserTable
-import de.steamwar.sql.Team
-import de.steamwar.sql.UserPerm
 import de.steamwar.sql.internal.useDb
 import de.steamwar.util.fetchData
 import io.ktor.http.*

WebsiteBackend/src/de/steamwar/routes/EventFights.kt

@@ -20,7 +20,8 @@
 package de.steamwar.routes
 
 import de.steamwar.ResponseError
-import de.steamwar.sql.*
+import de.steamwar.sql.EventFight
+import de.steamwar.sql.Team
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.request.*

WebsiteBackend/src/de/steamwar/routes/Events.kt

@@ -30,7 +30,6 @@ import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import kotlinx.serialization.Serializable
-import java.lang.StringBuilder
 import java.sql.Timestamp
 import java.time.Instant
 import java.util.*

WebsiteBackend/src/de/steamwar/routes/Page.kt

@@ -38,11 +38,9 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
-import java.time.Instant
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
-import java.util.Base64
+import java.util.*
-import java.util.Date
 
 val pathPageIdMap = mutableMapOf<String, Int>()
 var pageId = 1

WebsiteBackend/src/de/steamwar/routes/Schematic.kt

@@ -22,8 +22,11 @@ package de.steamwar.routes
 import de.steamwar.ResponseError
 import de.steamwar.plugins.SWAuthPrincipal
 import de.steamwar.plugins.SWPermissionCheck
-import de.steamwar.sql.*
+import de.steamwar.sql.NodeData
 import de.steamwar.sql.NodeData.SchematicFormat
+import de.steamwar.sql.NodeDownload
+import de.steamwar.sql.SWException
+import de.steamwar.sql.SchematicNode
 import dev.dewy.nbt.Nbt
 import dev.dewy.nbt.tags.collection.CompoundTag
 import io.ktor.http.*

WebsiteBackend/src/de/steamwar/routes/UserPerms.kt

@@ -23,17 +23,11 @@ import de.steamwar.plugins.SWPermissionCheck
 import de.steamwar.plugins.getUser
 import de.steamwar.sql.SteamwarUser
 import de.steamwar.sql.UserPerm
-import io.ktor.http.HttpStatusCode
+import io.ktor.http.*
-import io.ktor.server.application.ApplicationCall
+import io.ktor.server.application.*
-import io.ktor.server.application.call
+import io.ktor.server.response.*
-import io.ktor.server.application.install
+import io.ktor.server.routing.*
-import io.ktor.server.response.respond
+import kotlinx.serialization.Serializable
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.delete
-import io.ktor.server.routing.get
-import io.ktor.server.routing.put
-import io.ktor.server.routing.route
-import kotlinx.serialization.Serializable;
 
 @Serializable
 data class RespondPrefix(val name: String, val colorCode: String, val chatPrefix: String)

WebsiteBackend/src/de/steamwar/sql/Stats.kt

@@ -21,7 +21,6 @@ package de.steamwar.sql
 
 import de.steamwar.sql.internal.useDb
 import org.jetbrains.exposed.v1.core.IntegerColumnType
-import org.jetbrains.exposed.v1.core.VarCharColumnType
 import java.sql.ResultSet
 
 private val getNum: (ResultSet) -> Int? = {