Unpack CLI distribution in release

- Remove CLI installDist from build step
- Copy the packaged sw.zip into /jars during release
- Use `rm -rf` for the existing `/jars/sw` cleanup

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/dev/CreateKitCommand.java

@@ -0,0 +1,63 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.dev;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+
+import java.io.File;
+import java.io.IOException;
+
+@Linked
+public class CreateKitCommand extends SWCommand {
+
+    public CreateKitCommand() {
+        super("createkit");
+        if (!BauSystem.DEV_SERVER) unregister();
+    }
+
+    @Register
+    public void onCommand(Player player, String name) {
+        YamlConfiguration yaml = new YamlConfiguration();
+
+        yaml.set("Items", player.getInventory().getContents());
+        yaml.set("Armor", player.getInventory().getArmorContents());
+        yaml.set("Effects", player.getActivePotionEffects());
+        yaml.set("LeaderAllowed", true);
+        yaml.set("MemberAllowed", true);
+        yaml.set("EnterStage", 0);
+        yaml.set("TNT", true);
+
+        YamlConfiguration kits = new YamlConfiguration();
+
+        kits.set("Kits." + name, yaml);
+
+        try {
+            kits.save(new File("new.kits.yaml"));
+
+            player.sendMessage("Kit created!");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java

@@ -135,7 +135,7 @@ public abstract class ViewFlag {
                 }
 
                 Location secoundLocation;
-                if (previousVelocity.getX() >= previousVelocity.getZ()) {
+                if (Math.abs(previousVelocity.getX()) >= Math.abs(previousVelocity.getZ())) {
                     secoundLocation = previous.getLocation().clone().add(delta.getX(), delta.getY(), 0);
                 } else {
                     secoundLocation = previous.getLocation().clone().add(0, delta.getY(), delta.getZ());
@@ -198,6 +198,16 @@ public abstract class ViewFlag {
         }
     };
 
+    public static ViewFlag HIGHLIGHT = new ViewFlag(true, false, "highlight", "h") {
+        @Override
+        public void modify(REntityServer server, List<TraceEntity> entities) {
+            for (TraceEntity entity : entities) {
+                entity.setGlowing(true);
+            }
+        }
+
+    };
+
     /**
      * Name of the flag
      */

CLI/build.gradle.kts

@@ -0,0 +1,32 @@
+plugins {
+    steamwar.kotlin
+    application
+}
+
+kotlin {
+    jvmToolchain(21)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+application {
+    mainClass.set("de.steamwar.MainKt")
+    applicationName = "sw"
+}
+
+dependencies {
+    implementation(project(":CommonCore:SQL"))
+
+    implementation("com.github.ajalt.clikt:clikt:5.0.3")
+    implementation("com.github.ajalt.mordant:mordant:3.0.2")
+    implementation(libs.logback)
+    implementation("org.mariadb.jdbc:mariadb-java-client:3.3.1")
+
+    implementation(libs.exposedCore)
+    implementation(libs.exposedDao)
+    implementation(libs.exposedJdbc)
+    implementation(libs.exposedTime)
+}

CLI/src/Main.kt

@@ -0,0 +1,22 @@
+package de.steamwar
+
+import com.github.ajalt.clikt.core.main
+import com.github.ajalt.clikt.core.subcommands
+import de.steamwar.commands.SteamWar
+import de.steamwar.commands.database.DatabaseCommand
+import de.steamwar.commands.database.InfoCommand
+import de.steamwar.commands.database.ResetCommand
+import de.steamwar.commands.dev.DevCommand
+import de.steamwar.commands.profiler.ProfilerCommand
+import de.steamwar.commands.user.UserCommand
+import de.steamwar.commands.user.UserInfoCommand
+import de.steamwar.commands.user.UserSearchCommand
+
+fun main(args: Array<String>) = SteamWar()
+    .subcommands(
+        DatabaseCommand().subcommands(InfoCommand(), ResetCommand()),
+        UserCommand().subcommands(UserInfoCommand(), UserSearchCommand()),
+        DevCommand(),
+        ProfilerCommand()
+    )
+    .main(args)

CLI/src/commands/SteamWar.kt

@@ -0,0 +1,10 @@
+package de.steamwar.commands
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.mordant.rendering.TextStyles
+
+class SteamWar: CliktCommand(name = "sw") {
+    override fun run() {
+        echo(TextStyles.bold("SteamWar-CLI"))
+    }
+}

CLI/src/commands/database/DatabaseCommand.kt

@@ -0,0 +1,22 @@
+package de.steamwar.commands.database
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.findOrSetObject
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.option
+import de.steamwar.db.Database
+
+class DatabaseCommand: CliktCommand(name = "db") {
+    val useProduction by option().flag()
+    val db by findOrSetObject { Database }
+
+    override fun help(context: Context): String = "Run database commands"
+
+    override fun run() {
+        if (!useProduction && db.database == "production") {
+            throw CliktError("You should not use the production database!")
+        }
+    }
+}

CLI/src/commands/database/InfoCommand.kt

@@ -0,0 +1,25 @@
+package de.steamwar.commands.database
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.requireObject
+import com.github.ajalt.mordant.table.table
+import de.steamwar.db.Database
+import de.steamwar.db.execute
+import de.steamwar.db.useDb
+
+class InfoCommand: CliktCommand() {
+    val db by requireObject<Database>()
+
+    override fun run() = useDb {
+        val tables = execute("SHOW TABLES") { it.getString(1) }
+
+        echo(
+            table {
+                header { row("Name") }
+                body {
+                    tables.map { row(it) }
+                }
+            }
+        )
+    }
+}

CLI/src/commands/database/ResetCommand.kt

@@ -0,0 +1,33 @@
+package de.steamwar.commands.database
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.core.requireObject
+import com.github.ajalt.mordant.rendering.TextColors
+import com.github.ajalt.mordant.rendering.TextStyles
+import de.steamwar.db.Database
+import de.steamwar.db.execute
+import de.steamwar.db.useDb
+import java.io.File
+
+class ResetCommand: CliktCommand() {
+    val db by requireObject<Database>()
+
+    override fun run() = useDb {
+        val schemaFile = File("/var/Schema.sql")
+        if (!schemaFile.exists()) {
+            throw CliktError("Schema file not found!")
+        }
+
+        val schema = schemaFile.readText()
+
+        val tables = execute("SHOW TABLES;") { it.getString(1) }
+        for (table in tables) {
+            execute("DROP TABLE IF EXISTS $table;") { }
+        }
+
+        execute(schema) { }
+
+        echo(TextColors.brightGreen(TextStyles.bold("Database reset!")))
+    }
+}

CLI/src/commands/dev/DevCommand.kt

@@ -0,0 +1,179 @@
+package de.steamwar.commands.dev
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+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
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.file
+import com.github.ajalt.clikt.parameters.types.long
+import com.github.ajalt.clikt.parameters.types.path
+import com.sun.security.auth.module.UnixSystem
+import java.io.File
+import kotlin.io.path.absolute
+import kotlin.io.path.absolutePathString
+
+const val LOG4J_CONFIG = """<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="com.mojang.util">
+    <Appenders>
+        <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
+        <Queue name="TerminalConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="$\{'sys:logPath'}/latest.log" filePattern="$\{'sys:logPath'}/%d{yyyy.MM.dd}.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+            </Policies>
+            <DefaultRolloverStrategy max="7"/>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="WINDOWS_COMPAT" level="info"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="TerminalConsole" level="info"/>
+        </Root>
+    </Loggers>
+</Configuration>"""
+
+class DevCommand : CliktCommand("dev") {
+    override fun help(context: Context): String = "Start a dev Server"
+
+    override val treatUnknownOptionsAsArgs = true
+
+    val server by argument().help("Server Template")
+    val port by option("--port").long().defaultLazy { UnixSystem().uid + 1010 }.help("Port for Server")
+    val world by option("--world", "-w").path(canBeFile = false).help("User World")
+    val plugins by option("--plugins", "-p").path(true, canBeFile = false).help("Plugin Dir")
+    val profile by option().flag().help("Add Profiling Arguments")
+    val forceUpgrade by option().flag().help("Force Upgrade")
+    val jar by option().file(true, canBeDir = false).help("Jar File")
+    val jvm by option().file(true, canBeDir = false).help("Java Executable")
+    val jvmArgs by argument().multiple()
+
+    override val printHelpOnEmptyArgs = true
+
+    val workingDir = File("").absoluteFile
+    val log4jConfig = File(workingDir, "log4j2.xml")
+
+    override fun run() {
+        val args = mutableListOf<String>()
+
+        val serverDirectory = File(workingDir, server)
+        val serverDir =
+            if (serverDirectory.exists() && serverDirectory.isDirectory) serverDirectory else File(workingDir, server)
+
+        if (isVelocity(server)) {
+            runServer(args, jvmArgs, listOf(jar?.absolutePath ?: File("/jar/Velocity.jar").absolutePath), serverDir)
+        } else {
+            setLogConfig(args)
+            val version = findVersion(server) ?: throw CliktError("Unknown Server Version")
+            val worldFile = world?.absolute()?.toFile() ?: File(serverDir, "devtempworld")
+            val jarFile = jar?.absolutePath ?: additionalVersions[server]?.let { supportedVersionJars[it] } ?: supportedVersionJars[version]
+            ?: throw CliktError("Unknown Server Version")
+
+            if (!worldFile.exists()) {
+                val templateFile = File(serverDir, "Bauwelt")
+                if (!templateFile.exists()) {
+                    throw CliktError("World Template not found!")
+                }
+                templateFile.copyRecursively(worldFile)
+            }
+
+            val devFile = File("/configs/DevServer/${System.getProperty("user.name")}.$port.$version")
+            if (System.getProperty("user.name") != "minecraft") {
+                devFile.createNewFile()
+            }
+
+            runServer(
+                args, jvmArgs, listOf(
+                    jarFile,
+                    *(if (forceUpgrade) arrayOf("-forceUpgrade") else arrayOf()),
+                    "--port", port.toString(),
+                    "--level-name", worldFile.name,
+                    "--world-dir", workingDir.absolutePath,
+                    "--nogui",
+                    *(if (plugins != null) arrayOf("--plugins", plugins!!.absolutePathString()) else arrayOf())
+                ), serverDir
+            )
+
+            try {
+                devFile.delete()
+            } catch (_: Exception) { /* ignored */ }
+        }
+    }
+
+    val jvmDefaultParams = arrayOf(
+        "-Xmx1G",
+        "-Xgc:excessiveGCratio=80",
+        "-Xsyslog:none",
+        "-Xtrace:none",
+        "-Xnoclassgc",
+        "-Xdisableexplicitgc",
+        "-XX:+AlwaysPreTouch",
+        "-XX:+CompactStrings",
+        "-XX:-HeapDumpOnOutOfMemory",
+        "-XX:+ExitOnOutOfMemoryError"
+    )
+
+    val jvmArgOverrides = arrayOf("--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED")
+
+    val supportedVersionJars = mapOf(
+        8 to "/jars/paper-1.8.8.jar",
+        9 to "/jars/spigot-1.9.4.jar",
+        10 to "/jars/paper-1.10.2.jar",
+        12 to "/jars/spigot-1.12.2.jar",
+        14 to "/jars/spigot-1.14.4.jar",
+        15 to "/jars/spigot-1.15.2.jar",
+        18 to "/jars/paper-1.18.2.jar",
+        19 to "/jars/paper-1.19.3.jar",
+        20 to "/jars/paper-1.20.1.jar",
+        21 to "/jars/paper-1.21.6.jar"
+    )
+
+    val additionalVersions = mapOf(
+        "Tutorial" to 15,
+        "Lobby" to 20
+    )
+
+    fun findVersion(server: String): Int? = server.dropWhile { !it.isDigit() }.toIntOrNull()
+
+    fun isJava8(server: String): Boolean = findVersion(server)?.let { it <= 10 } ?: false
+
+    fun isVelocity(server: String): Boolean = server.endsWith("Velocity")
+
+    fun setLogConfig(args: MutableList<String>) {
+        args += "-DlogPath=${workingDir.absolutePath}/logs"
+        args += "-Dlog4j.configurationFile=${log4jConfig.absolutePath}"
+
+        if (!log4jConfig.exists()) {
+            log4jConfig.writeText(LOG4J_CONFIG)
+        }
+    }
+
+    fun runServer(args: List<String>, jvmArgs: List<String>, cmd: List<String>, serverDir: File) {
+        val process = ProcessBuilder(
+            jvm?.absolutePath ?: if (isJava8(server)) "/usr/lib/jvm/openj9-8/bin/java" else "java",
+            *jvmArgs.toTypedArray(),
+            *args.toTypedArray(),
+            *jvmDefaultParams,
+            *(if (isJava8(server)) arrayOf() else jvmArgOverrides),
+            *(if (profile) arrayOf("-javaagent:/jars/LixfelsProfiler.jar=start") else arrayOf()),
+            "-Xshareclasses:nonfatal,name=$server",
+            "-jar",
+            *cmd.toTypedArray()
+        ).directory(serverDir).inheritIO().start()
+        Runtime.getRuntime().addShutdownHook(Thread { if (process.isAlive) process.destroyForcibly() })
+        process.waitFor()
+    }
+}

CLI/src/commands/profiler/ProfilerCommand.kt

@@ -0,0 +1,42 @@
+package de.steamwar.commands.profiler
+
+import com.github.ajalt.clikt.core.CliktCommand
+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.optional
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.int
+
+const val SPARK = "/jars/spark.jar"
+
+class ProfilerCommand: CliktCommand("profiler") {
+    val pid by argument().help("Process id").int().optional()
+    val port by option("--port", "-p").int().default(8543)
+
+    override fun run() {
+        if (pid != null) {
+            ProcessBuilder()
+                .command("java", "-jar", SPARK, pid.toString(), "port=$port")
+                .start()
+                .waitFor()
+
+            Thread.sleep(1000)
+
+            ProcessBuilder()
+                .command("ssh", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-p", port.toString(), "spark@localhost")
+                .inheritIO()
+                .start()
+                .waitFor()
+        } else {
+            ProcessBuilder()
+                .command("java", "-jar", SPARK)
+                .inheritIO()
+                .start()
+                .waitFor()
+        }
+    }
+
+    override fun help(context: Context): String = "Start a profiler"
+}

CLI/src/commands/user/UserCommand.kt

@@ -0,0 +1,9 @@
+package de.steamwar.commands.user
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+
+class UserCommand: CliktCommand("user") {
+    override fun run() = Unit
+    override fun help(context: Context): String = "User related commands"
+}

CLI/src/commands/user/UserInfoCommand.kt

@@ -0,0 +1,65 @@
+package de.steamwar.commands.user
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.mordant.table.table
+import de.steamwar.db.findUser
+import de.steamwar.db.useDb
+import de.steamwar.sql.Punishment
+import de.steamwar.sql.SessionTable
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.Team
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import java.time.Duration
+
+class UserInfoCommand : CliktCommand("info") {
+    val userId by argument().help("Id, Name, UUID or DiscordId")
+    val user by lazy { findUser(userId) ?: throw CliktError("User not found") }
+
+    override val printHelpOnEmptyArgs = true
+
+    override fun run() = useDb {
+        val sessions =
+            SessionTable.selectAll().where { SessionTable.userId eq user.id.value }
+                .map { it[SessionTable.startTime] to it[SessionTable.endTime] }
+
+        val totalPlayed = sessions.sumOf { Duration.between(it.first, it.second).toMinutes() } / 60.0
+        val firstJoin = sessions.minByOrNull { it.first }?.first
+        val lastJoin = sessions.maxByOrNull { it.second }?.second
+
+        val punishments = Punishment.getAllPunishmentsOfPlayer(user.id.value)
+
+        echo(
+            table {
+                body {
+                    row("Name", user.userName)
+                    row("UUID", user.uuid)
+                    row("Team", Team.byId(user.team).teamName)
+                    row("Leader", user.leader)
+                    row("Locale", user.locale)
+                    row("Beigetreten am", firstJoin)
+                    row("Zuletzt gesehen am", lastJoin)
+                    row("Spielzeit", totalPlayed.toString() + "h")
+                    row("Punishments", if (punishments.isEmpty()) "Keine" else table {
+                        header { row("Typ", "Ersteller", "Von", "Bis", "Grund") }
+                        body {
+                            punishments.map {
+                                row(
+                                    it.type,
+                                    SteamwarUser.byId(it.punisher)?.userName ?: it.punisher,
+                                    it.startTime.toString(),
+                                    if (it.perma) "Perma" else it.endTime.toString(),
+                                    it.reason
+                                )
+                            }
+                        }
+                    })
+                }
+            }
+        )
+
+    }
+}

CLI/src/commands/user/UserSearchCommand.kt

@@ -0,0 +1,42 @@
+package de.steamwar.commands.user
+
+import com.github.ajalt.clikt.core.CliktCommand
+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.mordant.table.table
+import de.steamwar.db.joinedOr
+import de.steamwar.db.useDb
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.SteamwarUserTable
+import de.steamwar.sql.Team
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.like
+
+class UserSearchCommand : CliktCommand("search") {
+    val query by argument().help("Name, Id, UUID or DiscordId")
+
+    override val printHelpOnEmptyArgs = true
+
+    override fun help(context: Context): String = "Search for users"
+
+    override fun run() = useDb {
+        val users = SteamwarUser.find {
+            joinedOr(
+                SteamwarUserTable.username like "%$query%",
+                SteamwarUserTable.uuid like "%$query%",
+                query.toLongOrNull()?.let { SteamwarUserTable.discordId eq it },
+                query.toIntOrNull()?.let { SteamwarUserTable.id eq it }
+            )
+        }
+
+        val teams = mutableMapOf<Int, Team>()
+
+        echo(table {
+            header { row("Id", "Username", "UUID", "Team", "DiscordId") }
+            body {
+                users.map { row(it.id.value, it.userName, it.uuid, teams.computeIfAbsent(it.team) { teamId -> Team.byId(teamId) }.teamName, it.discordId) }
+            }
+        })
+    }
+}

CLI/src/db/Database.kt

@@ -0,0 +1,84 @@
+package de.steamwar.db
+
+import com.github.ajalt.clikt.core.BaseCliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.SteamwarUserTable
+import org.jetbrains.exposed.v1.core.Expression
+import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.v1.jdbc.Database
+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
+
+object Database {
+    lateinit var host: String
+    lateinit var port: String
+    lateinit var database: String
+    lateinit var db: Database
+
+    fun ensureConnected() {
+        if (::db.isInitialized) {
+            return
+        }
+        val config = File(System.getProperty("user.home"), "mysql.properties")
+
+        if (!config.exists()) {
+            throw CliktError("Config file not found!")
+        }
+
+        val props = Properties();
+
+        props.load(config.inputStream())
+
+        host = props.getProperty("host")
+        port = props.getProperty("port")
+        database = props.getProperty("database")
+
+        val username = props.getProperty("user")
+        val password = props.getProperty("password")
+
+        val url = "jdbc:mariadb://$host:$port/$database"
+
+        db = Database.connect(url, driver = "org.mariadb.jdbc.Driver", user = username, password = password)
+        return
+    }
+}
+
+fun <T: BaseCliktCommand<T>> BaseCliktCommand<T>.findUser(query: String): SteamwarUser? = transaction {
+    SteamwarUser.find { joinedOr(query.toIntOrNull()?.let { SteamwarUserTable.id eq it }, (SteamwarUserTable.username eq query), SteamwarUserTable.uuid eq query, query.toLongOrNull()?.let { SteamwarUserTable.discordId eq it }) }
+        .firstOrNull()
+        ?.let { return@transaction it }
+}
+
+fun joinedOr(vararg expressions: Expression<Boolean>?): Op<Boolean> =
+    expressions.filterNotNull().reduce { acc, expression -> acc or expression } as Op<Boolean>
+
+
+fun <T> JdbcTransaction.execute(sql: String, transform: (ResultSet) -> T): List<T> {
+    val result = mutableListOf<T>()
+    exec(sql) { rs ->
+        while (rs.next()) {
+            result += transform(rs)
+        }
+    }
+    return result
+}
+
+fun <T> JdbcTransaction.executeSingle(sql: String, transform: (ResultSet) -> T): T? {
+    return execute(sql) { rs ->
+        if (!rs.next()) {
+            return@execute null
+        }
+        transform(rs)
+    }.single()
+}
+
+fun useDb(statement: JdbcTransaction.() -> Unit) {
+    de.steamwar.db.Database.ensureConnected()
+    transaction(de.steamwar.db.Database.db, statement)
+}

CLI/src/logback.xml

@@ -0,0 +1,11 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

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

@@ -90,7 +90,7 @@ class EventGroup(id: EntityID<Int>) : IntEntity(id) {
         set(value) {
             groupPointsPerDraw = value
         }
-    val dependents by lazy { EventRelation.getGroupRelations(this).toList() }
+    val dependents by lazy { EventRelation.getGroupRelations(this) }
     val lastFight by lazy { Optional.ofNullable(fights.maxByOrNull { it.startTime }) }
 
     fun getId() = id.value

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

@@ -51,11 +51,11 @@ class EventRelation(id: EntityID<Int>) : IntEntity(id) {
 
         @JvmStatic
         fun getFightRelations(fight: EventFight) =
-            useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) } }
+            useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) }.toList() }
 
         @JvmStatic
         fun getGroupRelations(group: EventGroup) =
-            useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) } }
+            useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) }.toList() }
 
         @JvmStatic
         fun create(fight: EventFight, fightTeam: FightTeam, fromType: FromType, fromId: Int, fromPlace: Int) = useDb {

CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java

@@ -52,6 +52,10 @@ public final class GameModeConfig<M, W> {
     private static final Map<String, GameModeConfig<?, String>> byGameName;
     private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType;
 
+    public static <M> Collection<GameModeConfig<M, String>> getAll() {
+        return (Collection) byFileName.values();
+    }
+
     public static <M> GameModeConfig<M, String> getByFileName(File file) {
         return (GameModeConfig<M, String>) byFileName.get(file.getName());
     }
@@ -87,8 +91,24 @@ public final class GameModeConfig<M, W> {
         byFileName = new HashMap<>();
         byGameName = new HashMap<>();
         bySchematicType = new HashMap<>();
-        SchematicType.values();
         DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
+        init();
+    }
+
+    public static void init() {
+        byFileName.clear();
+        byGameName.clear();
+        bySchematicType.clear();
+
+        File folder = SQLWrapper.impl.getSchemTypesFolder();
+        if (!folder.exists()) return;
+        if (!folder.isDirectory()) return;
+
+        for (File file : Objects.requireNonNull(folder.listFiles())) {
+            if (!file.getName().endsWith(".yml")) continue;
+            if (file.getName().endsWith(".kits.yml")) continue;
+            SQLWrapper.impl.loadGameModeConfig(file);
+        }
 
         byFileName.values().forEach(gameModeConfig -> {
             List<SchematicType> subTypes = Collections.unmodifiableList(gameModeConfig.Schematic.SubTypesStrings.stream()
@@ -671,9 +691,9 @@ public final class GameModeConfig<M, W> {
             loaded = loader.canLoad();
             Size = new SizeConfig(loader.with("Size"));
             Inset = new InsetConfig(loader.with("Inset"));
-            Type = loader.getSchematicType("Type", "Normal");
+            Type = null;
             SubTypesStrings = loader.getStringList("SubTypes");
-            SubTypes = loader.getSchematicTypeList("SubTypes");
+            SubTypes = new ArrayList<>();
             Shortcut = loader.getString("Shortcut", "");
             Material = loader.getMaterial("Material", "STONE_BUTTON");
             ManualCheck = loader.getBoolean("ManualCheck", true);

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

@@ -94,7 +94,7 @@ class NodeMember(id: EntityID<CompositeID>) : CompositeEntity(id) {
         { Optional.ofNullable(it?.value) })
         private set
 
-    fun setParentId(id: Int?) {
+    fun setParentId(id: Int?) = useDb {
         parent = Optional.ofNullable(id)
     }
 

CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java

@@ -36,8 +36,5 @@ public interface SQLWrapper<M> {
         return Collections.emptyList();
     }
 
-    default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
-    }
-
     void additionalExceptionMetadata(StringBuilder builder);
 }

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

@@ -19,11 +19,7 @@
 
 package de.steamwar.sql
 
-import java.io.File
 import java.util.*
-import java.util.Locale
-import java.util.Locale.getDefault
-import java.util.stream.Collectors
 
 data class SchematicType(
     val name: String,
@@ -47,58 +43,65 @@ data class SchematicType(
         @JvmField
         val Normal = SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false)
 
-        private val types: List<SchematicType>
-        private val fromDB: Map<String, SchematicType>?
+        private val types: MutableList<SchematicType> = mutableListOf()
+        private val fromDB: MutableMap<String, SchematicType> = mutableMapOf()
 
         init {
-            val tmpTypes = mutableListOf<SchematicType>()
-            val tmpFromDB = mutableMapOf<String, SchematicType>()
-
-            tmpTypes.add(Normal)
-            tmpFromDB[Normal.toDB()] = Normal
-
-            val folder = SQLWrapper.impl.schemTypesFolder
-            if (folder.exists()) {
-                for (configFile in Arrays.stream<File?>(folder.listFiles { _, name ->
-                    name.endsWith(
-                        ".yml"
-                    ) && !name.endsWith(".kits.yml")
-                }).sorted().collect(Collectors.toList())) {
-                    val gameModeConfig = SQLWrapper.impl.loadGameModeConfig(configFile)
-                    if (gameModeConfig.Schematic.Type == null) continue
-                    if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue
-                    val current = gameModeConfig.Schematic.Type
-                    if (gameModeConfig.CheckQuestions.isNotEmpty()) {
-                        val checkType = current.checkType
-                        tmpTypes.add(checkType!!)
-                        tmpFromDB[checkType.toDB()] = checkType
-                    }
-                    tmpTypes.add(current)
-                    tmpFromDB[current.toDB()] = current
-                    SQLWrapper.impl.processSchematicType(gameModeConfig)
-                }
-            }
-
-            types = tmpTypes.toList()
-            fromDB = tmpFromDB.toMap()
+            GameModeConfig.init()
+            init()
         }
 
         @JvmStatic
-        fun values() = types
+        fun init() {
+            types.clear()
+            fromDB.clear()
+
+            types.add(Normal)
+            fromDB[Normal.toDB()] = Normal
+
+            for (gameModeConfig in GameModeConfig.getAll<Any>()) {
+                val type = gameModeConfig.Schematic.Type
+                    ?: continue
+                if (fromDB.containsKey(type.toDB())) continue
+
+                types.add(type)
+                fromDB[type.toDB()] = type
+                if (gameModeConfig.CheckQuestions.isNotEmpty() && type.checkType != null) {
+                    types.add(type.checkType)
+                    fromDB[type.checkType.toDB()] = type.checkType
+                }
+            }
+        }
 
         @JvmStatic
-        fun fromDB(value: String) = fromDB?.let { it[value.lowercase()] }
+        fun values() =
+            types
+
+        @JvmStatic
+        fun fromDB(value: String) =
+            fromDB[value.lowercase()]
     }
 
-    fun name() = name
-    fun toDB() = name.lowercase()
+    fun name() =
+        name
 
-    fun check() = type == Type.CHECK_TYPE
-    fun fightType() = type == Type.FIGHT_TYPE
-    fun writeable() = type == Type.NORMAL
+    fun toDB() =
+        name.lowercase()
 
-    fun checkType() = if (manualCheck) checkType else this
-    fun isAssignable() = type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
+    fun check() =
+        type == Type.CHECK_TYPE
+
+    fun fightType() =
+        type == Type.FIGHT_TYPE
+
+    fun writeable() =
+        type == Type.NORMAL
+
+    fun checkType() =
+        if (manualCheck) checkType else this
+
+    fun isAssignable() =
+        type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
 
     enum class Type {
         NORMAL,

FightSystem/FightSystem_21/build.gradle.kts

@@ -42,4 +42,5 @@ dependencies {
 
     compileOnly(libs.fastutil)
     compileOnly(libs.authlib)
+    compileOnly(project(":FightSystem:FightSystem_14"))
 }

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/listener/WindchargeStopper21.java

@@ -0,0 +1,51 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.listener;
+
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentTask;
+import net.minecraft.world.entity.projectile.windcharge.WindCharge;
+import org.bukkit.Location;
+
+public class WindchargeStopper21 implements WindchargeStopper.IWindchargeStopper {
+
+    public WindchargeStopper21() {
+        new StateDependentTask(true, FightState.Running, this::run, 1, 1);
+    }
+
+    private static final int middleLine = Config.SpecSpawn.getBlockZ();
+
+    private static final Class<?> windChargeClass = WindCharge.class;
+
+    private void run() {
+        Recording.iterateOverEntities(windChargeClass::isInstance, entity -> {
+            Location location = entity.getLocation();
+            Location prevLocation = location.clone().subtract(entity.getVelocity());
+
+            boolean passedMiddle = location.getBlockZ() > middleLine && prevLocation.getBlockZ() > middleLine ||
+                    location.getBlockZ() < middleLine && prevLocation.getBlockZ() < middleLine;
+
+            if(!passedMiddle) {
+                entity.remove();
+            }
+        });
+    }
+}

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/FlatteningWrapper21.java

@@ -0,0 +1,29 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.utils;
+
+import org.bukkit.inventory.ItemStack;
+
+public class FlatteningWrapper21 extends FlatteningWrapper14 {
+    @Override
+    public boolean hasAttributeModifier(ItemStack stack) {
+        return stack.hasItemMeta() && stack.getItemMeta() != null && stack.getItemMeta().hasAttributeModifiers();
+    }
+}

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java

@@ -38,6 +38,27 @@ public class ReflectionWrapper21 implements ReflectionWrapper {
         FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
         FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
         FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
+
+        FORBIDDEN_TYPES.add(DataComponentTypes.ATTRIBUTE_MODIFIERS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.TOOL);
+        FORBIDDEN_TYPES.add(DataComponentTypes.WEAPON);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FOOD);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CONSUMABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.POTION_CONTENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.STORED_ENCHANTMENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_BREAK);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_PLACE_ON);
+        FORBIDDEN_TYPES.add(DataComponentTypes.MAX_DAMAGE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.USE_REMAINDER);
+        FORBIDDEN_TYPES.add(DataComponentTypes.USE_COOLDOWN);
+        FORBIDDEN_TYPES.add(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CHARGED_PROJECTILES);
+        FORBIDDEN_TYPES.add(DataComponentTypes.INTANGIBLE_PROJECTILE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORKS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORK_EXPLOSION);
+        FORBIDDEN_TYPES.add(DataComponentTypes.EQUIPPABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.REPAIR_COST);
+        FORBIDDEN_TYPES.add(DataComponentTypes.ENCHANTABLE);
     }
 
     @Override

FightSystem/FightSystem_8/src/de/steamwar/fightsystem/listener/WindchargeStopper8.java

@@ -0,0 +1,23 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.listener;
+
+public class WindchargeStopper8 implements WindchargeStopper.IWindchargeStopper {
+}

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

@@ -98,10 +98,12 @@ public class FightSystem extends JavaPlugin {
         new StateDependentListener(ArenaMode.All, FightState.All, BountifulWrapper.impl.newDenyArrowPickupListener());
         new OneShotStateDependent(ArenaMode.All, FightState.PreSchemSetup, () -> Fight.playSound(SWSound.BLOCK_NOTE_PLING.getSound(), 100.0f, 2.0f));
         new OneShotStateDependent(ArenaMode.Test, FightState.All, WorldEditRendererCUIEditor::new);
-        try {
-            Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, ArenaMode.AntiTest.contains(Config.mode));
-        } catch (Exception e) {
-            // Ignore if failed!
+        if (Core.getVersion() >= 19) {
+            try {
+                Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, ArenaMode.AntiTest.contains(Config.mode));
+            } catch (Exception e) {
+                // Ignore if failed!
+            }
         }
 
         techHider = new TechHiderWrapper();

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

@@ -35,10 +35,7 @@ import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryAction;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.event.inventory.*;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
@@ -81,25 +78,8 @@ public class PersonalKitCreator implements Listener {
         if(!openKitCreators.containsKey(e.getWhoClicked()))
             return;
 
-        Player player = (Player) e.getWhoClicked();
-        //Deny bad items
         if(Kit.isBadItem(e.getCursor()))
             e.setCancelled(true);
-
-        /* Should the inventory reset? */
-        if(e.getAction() != InventoryAction.PLACE_ALL)
-            return;
-
-        ItemStack[] items = e.getWhoClicked().getInventory().getContents();
-        for(int i = 0; i < items.length; i++){
-            ItemStack stack = items[i];
-            if(stack != null && i != e.getSlot())
-                return;
-        }
-
-        FightPlayer fightPlayer = Fight.getFightPlayer(player);
-        assert fightPlayer != null;
-        Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> fightPlayer.getKit().loadToPlayer(player), 1);
     }
 
     @EventHandler
@@ -117,7 +97,10 @@ public class PersonalKitCreator implements Listener {
         if(backup == null)
             return;
 
-        backup.close();
+        InventoryType type = e.getInventory().getType();
+        if(type != InventoryType.PLAYER && type != InventoryType.CREATIVE) {
+            backup.close();
+        }
     }
 
     @EventHandler
@@ -126,7 +109,7 @@ public class PersonalKitCreator implements Listener {
         if(backup == null)
             return;
 
-        backup.close();
+        Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), backup::close, 1);
     }
 
     @EventHandler
@@ -151,9 +134,11 @@ public class PersonalKitCreator implements Listener {
         }
 
         private void close(){
-            openKitCreators.remove(player);
             Kit kit1 = new Kit(kit.getName(), player);
             kit1.removeBadItems();
+
+
+            openKitCreators.remove(player);
             kit1.toPersonalKit(kit);
             backup.loadToPlayer(player);
             player.setGameMode(GameMode.SURVIVAL);

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

@@ -0,0 +1,35 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.listener;
+
+import de.steamwar.core.VersionDependent;
+import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.linkage.Linked;
+
+@Linked
+public class WindchargeStopper {
+
+    static {
+        VersionDependent.getVersionImpl(FightSystem.getPlugin());
+    }
+
+    public interface IWindchargeStopper {
+    }
+}

SchematicSystem/SchematicSystem_21/build.gradle.kts

@@ -0,0 +1,37 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+dependencies {
+    compileOnly(project(":SpigotCore", "default"))
+    compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default"))
+
+    compileOnly(libs.paperapi21) {
+        attributes {
+            // Very Hacky, but it works
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
+        }
+    }
+
+    compileOnly(libs.nms21)
+    compileOnly(libs.fawe21)
+}

SchematicSystem/SchematicSystem_21/src/de/steamwar/schematicsystem/autocheck/AutoChecker21.java

@@ -0,0 +1,137 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.schematicsystem.autocheck;
+
+import com.sk89q.jnbt.CompoundTag;
+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 org.bukkit.Material;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class AutoChecker21 implements AutoChecker.IAutoChecker {
+
+    public AutoChecker.BlockScanResult scan(Clipboard clipboard, GameModeConfig<Material, String> type) {
+        AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
+        BlockVector3 min = clipboard.getMinimumPoint();
+        BlockVector3 max = clipboard.getMaximumPoint();
+        for (int x = min.getBlockX(); x <= max.getBlockX(); x++) {
+            for (int y = min.getBlockY(); y <= max.getBlockY(); y++) {
+                for (int z = min.getBlockZ(); z <= max.getBlockZ(); z++) {
+                    final BaseBlock block = clipboard.getFullBlock(BlockVector3.at(x, y, z));
+                    final Material material = Material.matchMaterial(block.getBlockType().getId());
+                    if (material == null) {
+                        continue;
+                    }
+
+                    result.getBlockCounts().merge(material, 1, Integer::sum);
+
+                    if (AutoCheckerItems.impl.getInventoryMaterials().contains(material)) {
+                        checkInventory(result, block, material, new BlockPos(x, y, z), type);
+                    }
+
+                    if (x == min.getBlockX() || x == max.getBlockX() || y == max.getBlockY() || z == min.getBlockZ() || z == max.getBlockZ()) {
+                        result.getDesignBlocks().computeIfAbsent(material, m -> new ArrayList<>()).add(new BlockPos(x, y, z));
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private static final Map<Material, Set<Material>> itemsInInv = new EnumMap<>(Material.class);
+
+    static {
+        itemsInInv.put(Material.BUCKET, EnumSet.of(Material.DISPENSER));
+        itemsInInv.put(Material.TNT, EnumSet.of(Material.CHEST, Material.BARREL, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX,
+                Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX,
+                Material.LIGHT_GRAY_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX,
+                Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX));
+        itemsInInv.put(Material.FIRE_CHARGE, EnumSet.of(Material.DISPENSER));
+        itemsInInv.put(Material.ARROW, EnumSet.of(Material.DISPENSER));
+        AutoCheckerItems.impl.getAllowedMaterialsInInventory().forEach(material -> itemsInInv.put(material, AutoCheckerItems.impl.getInventoryMaterials()));
+    }
+
+    private void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos, GameModeConfig<Material, String> type) {
+        CompoundTag nbt = block.getNbtData();
+        if (nbt == null) {
+            result.getDefunctNbt().add(pos);
+            return;
+        }
+
+
+        if (material == Material.JUKEBOX && nbt.getValue().containsKey("RecordItem")) {
+            result.getRecords().add(pos);
+            return;
+        }
+
+        List<CompoundTag> items = nbt.getList("Items", CompoundTag.class);
+        if (items.isEmpty())
+            return; // Leeres Inventar
+
+        int counter = 0;
+        int windChargeCount = 0;
+        for (CompoundTag item : items) {
+            if (!item.containsKey("id")) {
+                result.getDefunctNbt().add(pos);
+                continue;
+            }
+
+            Material itemType = Material.matchMaterial(item.getString("id"));
+            if (itemType == null) // Leere Slots
+                continue;
+
+            if(type.Schematic.Type.getName().equals("wargearseason26") && material == Material.DISPENSER && itemType == Material.WIND_CHARGE) {
+                windChargeCount += item.getInt("count");
+            }
+            else if (!itemsInInv.getOrDefault(itemType, EnumSet.noneOf(Material.class)).contains(material)) {
+                result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
+            } else if (material == Material.DISPENSER && (itemType == Material.ARROW || itemType == Material.FIRE_CHARGE)) {
+                counter += Core.getVersion() >= 21 ? item.getInt("count") : item.getByte("Count");
+            }
+            if (item.containsKey("tag")) {
+                result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
+            }
+        }
+        result.getDispenserItems().put(pos, counter);
+        result.getWindChargeCount().put(pos, windChargeCount);
+    }
+
+    @Override
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
+        return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
+                .depth(clipboard.getDimensions().getBlockZ()).blockScanResult(scan(clipboard, type))
+                .entities(clipboard.getEntities().stream().map(Entity::getLocation)
+                        .map(blockVector3 -> new BlockPos(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()))
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+    @Override
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
+        return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
+                .depth(clipboard.getDimensions().getBlockZ()).build();
+    }
+}

SchematicSystem/SchematicSystem_21/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems21.java

@@ -0,0 +1,49 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU Affero General Public License as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.schematicsystem.autocheck;
+
+import org.bukkit.Material;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+public class AutoCheckerItems21 implements AutoCheckerItems {
+
+    private static final Set<Material> INVENTORY = EnumSet.of(Material.BARREL, Material.BLAST_FURNACE, Material.BREWING_STAND, Material.CAMPFIRE,
+            Material.CHEST, Material.DISPENSER, Material.DROPPER, Material.FURNACE, Material.HOPPER, Material.JUKEBOX, Material.SHULKER_BOX,
+            Material.WHITE_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX,
+            Material.LIME_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.CYAN_SHULKER_BOX,
+            Material.PURPLE_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.RED_SHULKER_BOX,
+            Material.BLACK_SHULKER_BOX, Material.SMOKER, Material.TRAPPED_CHEST);
+
+    private static final Set<Material> FLOWERS = EnumSet.of(Material.CORNFLOWER, Material.POPPY, Material.FERN, Material.DANDELION, Material.BLUE_ORCHID,
+            Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY,
+            Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SUNFLOWER, Material.DIAMOND_HORSE_ARMOR, Material.IRON_HORSE_ARMOR,
+            Material.GOLDEN_HORSE_ARMOR, Material.LEATHER_HORSE_ARMOR, Material.HONEY_BOTTLE, Material.LILAC, Material.ROSE_BUSH, Material.PEONY,
+            Material.TALL_GRASS, Material.LARGE_FERN);
+
+    @Override
+    public Set<Material> getInventoryMaterials() {
+        return INVENTORY;
+    }
+
+    @Override
+    public Set<Material> getAllowedMaterialsInInventory() {
+        return FLOWERS;
+    }
+}

SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties

@@ -262,6 +262,8 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blocks: §c{0}§7, Max: §e{1}
 AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unknown block: §c{0}
 AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
 AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Forbidden block: §c{0}
+AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
+AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Dispenser: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Forbidden Item: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Defunct NBT: §7[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} in Design: [{1}, {2}, {3}]

SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties

@@ -242,6 +242,8 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blöcke: §c{0}§7, Max: §e{1}
 AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unbekannter Block: §c{0}
 AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
 AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Verbotener Block: §c{0}
+AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
+AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Werfer: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Verbotener gegenstand: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Keine NBT-Daten: §c[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} im Design: [{1}, {2}, {3}]

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

@@ -55,6 +55,7 @@ public class AutoChecker {
         private final List<BlockPos> records = new ArrayList<>();
         private final Map<Material, List<BlockPos>> designBlocks = new EnumMap<>(Material.class);
         private final Map<BlockPos, Integer> dispenserItems = new HashMap<>();
+        private final Map<BlockPos, Integer> windChargeCount = new HashMap<>();
         private final Map<BlockPos, Set<Material>> forbiddenItems = new HashMap<>();
         private final Map<BlockPos, Set<Material>> forbiddenNbt = new HashMap<>();
     }

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

@@ -52,6 +52,7 @@ public class AutoCheckerResult {
                 isBlockCountOk() &&
                 isLimitedBlocksOK() &&
                 isDispenserItemsOK() &&
+                isWindchargeCountOK() &&
                 !type.isAfterDeadline() &&
                 entities.isEmpty() &&
                 isDesignBlastResistanceOK();
@@ -62,8 +63,18 @@ public class AutoCheckerResult {
                 !type.isAfterDeadline();
     }
 
+    public boolean isWindchargeCountOK() {
+        if( type.Schematic.Type.getName().equals("wargearseason26")) {
+            int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
+            return windChargesCount <= 2048;  
+        }
+        else {
+            return true;
+        }
+    }
+
     public boolean isDispenserItemsOK() {
-        return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);
+        return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);  
     }
 
     public boolean hasWarnings() {
@@ -127,6 +138,19 @@ public class AutoCheckerResult {
                 }
             });
         }
+
+        if(!isWindchargeCountOK()) {
+            int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
+            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES", p, windChargesCount, 2048);
+            blockScanResult.getWindChargeCount().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > 0).forEach(blockVector3IntegerEntry -> {
+                SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
+                        blockVector3IntegerEntry.getKey().getBlockX(),
+                        blockVector3IntegerEntry.getKey().getBlockY(),
+                        blockVector3IntegerEntry.getKey().getBlockZ(),
+                        blockVector3IntegerEntry.getValue());
+            });
+        }
+
         blockScanResult.getDispenserItems().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > type.Schematic.MaxDispenserItems).forEach(blockVector3IntegerEntry -> {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_TOO_MANY_DISPENSER_ITEMS", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
                     blockVector3IntegerEntry.getKey().getBlockX(),
@@ -135,6 +159,7 @@ public class AutoCheckerResult {
                     blockVector3IntegerEntry.getValue(),
                     type.Schematic.MaxDispenserItems);
         });
+
         blockScanResult.getRecords().forEach(blockVector3 -> {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_RECORD", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3), blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
         });

SchematicSystem/build.gradle.kts

@@ -32,4 +32,5 @@ dependencies {
     implementation(project(":SchematicSystem:SchematicSystem_15"))
     implementation(project(":SchematicSystem:SchematicSystem_19"))
     implementation(project(":SchematicSystem:SchematicSystem_20"))
+    implementation(project(":SchematicSystem:SchematicSystem_21"))
 }

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

@@ -22,7 +22,6 @@ package de.steamwar.sql;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.commands.CheckCommand;
 
 import java.io.File;
 
@@ -38,15 +37,6 @@ public class SQLWrapperImpl implements SQLWrapper<String> {
         return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, true);
     }
 
-    @Override
-    public void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
-        SchematicType type = gameModeConfig.Schematic.Type;
-        if (type.checkType() != null) {
-            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
-            CheckCommand.addFightType(type.checkType(), type);
-        }
-    }
-
     @Override
     public void additionalExceptionMetadata(StringBuilder builder) {
         builder.append("\nServers: ");

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

@@ -25,7 +25,10 @@ import lombok.Getter;
 import lombok.experimental.UtilityClass;
 
 import java.io.File;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 @UtilityClass
 public class ArenaMode {
@@ -50,12 +53,12 @@ public class ArenaMode {
         if(!folder.exists())
             return;
 
-        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml") && !name.equals("config.yml"))).sorted().toList()) {
-            GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, false);
+        GameModeConfig.init();
+        SchematicType.init();
+        for (GameModeConfig<String, String> gameModeConfig : GameModeConfig.<String>getAll()) {
             if (!gameModeConfig.Server.loaded) continue;
-
             allModes.add(gameModeConfig);
-            byInternal.put(file.getName().replace(".yml", ""), gameModeConfig);
+            byInternal.put(gameModeConfig.configFile.getName().replace(".yml", ""), gameModeConfig);
             for (String name : gameModeConfig.Server.ChatNames) {
                 byChat.put(name.toLowerCase(), gameModeConfig);
             }

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

@@ -40,6 +40,7 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import java.awt.*;
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -48,20 +49,9 @@ import java.util.logging.Level;
 
 @Linked
 public class CheckCommand extends SWCommand {
-    private static final Map<SchematicType, SchematicType> fightTypes = new HashMap<>();
-    private static final Map<SchematicType, List<String>> checkQuestions = new HashMap<>();
-
     private static final Map<UUID, CheckSession> currentCheckers = new HashMap<>();
     private static final Map<Integer, CheckSession> currentSchems = new HashMap<>();
 
-    public static void setCheckQuestions(SchematicType checkType, List<String> checkQuestions) {
-        CheckCommand.checkQuestions.put(checkType, checkQuestions);
-    }
-
-    public static void addFightType(SchematicType checkType, SchematicType fightType) {
-        fightTypes.put(checkType, fightType);
-    }
-
     public static boolean isChecking(Player player){
         return currentCheckers.containsKey(player.getUniqueId());
     }
@@ -147,7 +137,7 @@ public class CheckCommand extends SWCommand {
         if(!schem.getSchemtype().check()){
             VelocityCore.getLogger().log(Level.SEVERE, () -> sender.user().getUserName() + " tried to check an uncheckable schematic!");
             return;
-        }else if(schem.getOwner() == sender.user().getId()) {
+        }else if(schem.getOwner() == sender.user().getId() && !sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
             sender.system("CHECK_SCHEMATIC_OWN");
             return;
         }
@@ -248,9 +238,9 @@ public class CheckCommand extends SWCommand {
             this.checker = checker;
             this.schematic = schematic;
             this.startTime = Timestamp.from(Instant.now());
-            this.checkList = checkQuestions.get(schematic.getSchemtype()).listIterator();
+            this.checkList = GameModeConfig.getBySchematicType(schematic.getSchemtype()).CheckQuestions.listIterator();
 
-            GameModeConfig<String, String> mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
+            GameModeConfig<String, String> mode = GameModeConfig.getBySchematicType(schematic.getSchemtype());
             new ServerStarter().test(mode, mode.getRandomMap(), checker.getPlayer()).check(schematic.getId()).callback(subserver -> {
                 currentCheckers.put(checker.user().getUUID(), this);
                 currentSchems.put(schematic.getId(), this);
@@ -304,7 +294,50 @@ public class CheckCommand extends SWCommand {
         }
 
         private void accept(){
-            concludeCheckSession("freigegeben", fightTypes.get(schematic.getSchemtype()), () -> {
+            // TODO: This Code is only for the WGS and because YoyoNow is not available this can be removed or changed after the WGS!
+            if (schematic.getSchemtype().toDB().equals("cwargearseason26")) {
+                int userId = schematic.getOwner();
+                SteamwarUser user = SteamwarUser.byId(userId);
+                int teamId = user.getTeam();
+
+                SchematicNode teamFolder = SchematicNode.getSchematicNodeInNode(172325)
+                        .stream()
+                        .filter(schematicNode -> schematicNode.getName().startsWith(teamId + "_"))
+                        .findFirst()
+                        .orElse(null);
+                if (teamFolder == null) {
+                    internalAccept();
+                    return;
+                }
+
+                // Copy Schem into team folder of -1 user
+                String name = DateTimeFormatter.ofPattern("yyyy.MM.dd_HH:mm:ss").format(schematic.getLastUpdate().toLocalDateTime());
+                NodeData data = NodeData.getLatest(schematic);
+                SchematicNode node = SchematicNode.createSchematic(-1, name, teamFolder.getNodeId());
+                NodeData.saveFromStream(node, data.schemData(false), data.getNodeFormat());
+
+                // Accept the team folder schematic and set other to Normal
+                node.setSchemtype(GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type);
+
+                // Conclude by setting send in schematic to normal and broadcast
+                concludeCheckSession("freigegeben", SchematicType.Normal, () -> {
+                    Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
+                    owner.withPlayerOrOffline(
+                            player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),
+                            () -> DiscordAlert.send(owner, Color.GREEN, new Message("DC_TITLE_SCHEMINFO"), new Message("DC_SCHEM_ACCEPT", schematic.getName()), true)
+                    );
+                    notifyTeam(new Message("CHECK_ACCEPTED_TEAM", schematic.getName(), owner.user().getUserName()));
+
+                    return owner.getPlayer() != null;
+                });
+                return;
+            }
+
+            internalAccept();
+        }
+
+        private void internalAccept() {
+            concludeCheckSession("freigegeben", GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type, () -> {
                 Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
                 owner.withPlayerOrOffline(
                         player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),

VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java

@@ -158,7 +158,6 @@ public class Tablist extends ChannelInboundHandlerAdapter {
 
     public void disable() {
         sendTabPacket(new ArrayList<>(directTabItems.values()), null);
-        directTabItems.clear();
         sendTabPacket(current, null);
         current.clear();
 

VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java

@@ -55,7 +55,7 @@ public class BauLock {
                 break;
             case SUPERVISOR:
                 BauweltMember member = BauweltMember.getBauMember(owner.getId(), target.getId());
-                locked = !member.isSupervisor();
+                locked = member == null || !member.isSupervisor();
                 break;
             case SERVERTEAM:
                 locked = !target.hasPerm(UserPerm.TEAM);

settings.gradle.kts

@@ -101,6 +101,7 @@ dependencyResolutionManagement {
             library("hamcrest", "org.hamcrest:hamcrest:2.2")
             library("classindex", "org.atteo.classindex:classindex:3.13")
 
+
             library("spigotapi", "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
             library("spigotannotations", "org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT")
             library("paperapi", "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
@@ -182,6 +183,8 @@ include(
 
 include("CommandFramework")
 
+include("CLI")
+
 include(
     "CommonCore",
     "CommonCore:Data",
@@ -222,6 +225,7 @@ include(
     "SchematicSystem:SchematicSystem_15",
     "SchematicSystem:SchematicSystem_19",
     "SchematicSystem:SchematicSystem_20",
+    "SchematicSystem:SchematicSystem_21",
     "SchematicSystem:SchematicSystem_Core"
 )
 

steamwarci.yml

@@ -33,4 +33,6 @@ artifacts:
   "/jars/website-api.jar": "WebsiteBackend/build/libs/WebsiteBackend-all.jar"
 
 release:
+  - "rm -rf /jars/sw"
+  - "unzip -o CLI/build/distributions/sw.zip -d /jars"
   - "sudo systemctl restart api.service"