Merge branch 'main' into version/legacy

Merge remote-tracking branch 'origin/main'
Add CLI artifact deployment and service restart steps in build workflow
2026-05-15 16:02:51 +02:00 · 2026-05-15 15:51:06 +02:00 · 2026-05-15 15:51:01 +02:00 · 2026-05-15 15:44:27 +02:00 · 2026-05-15 15:39:04 +02:00 · 2026-05-15 15:38:11 +02:00
92 changed files with 1900 additions and 1066 deletions
@@ -0,0 +1,60 @@
+name: Bug Report
+about: Du hast einen Fehler gefunden? Melde ihn hier!
+labels: [ "typ/bug" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ACHTUNG: Sollte es bei dem Bug ein Sicherheitsrisiko geben, melde es bitte auf unserem Discord Server
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Beschreibe deinen Bug in kurzer Form.
+  - type: input
+    id: mc-ver
+    attributes:
+      label: Minecraft Version
+      description: Minecraft Version des Clients
+    validations:
+      required: true
+  - type: input
+    id: mc-ver-ser
+    attributes:
+      label: Minecraft Version Server
+      description: Minecraft Version des Servers, nur bei Bau oder Arenen Servern
+  - type: dropdown
+    id: can-reproduce
+    attributes:
+      label: Kannst du den Fehler wiederholen?
+      description: |
+        Wenn du den Fehler wiederholen kannst, können wir dieses Problem schneller beheben.
+        Solltest du den Fehler nicht wiederholen können, melde dich bitte auf unserem Discord Server.
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Wie kannst du den Fehler wiederholen?
+      description: Welche Schritte musst du ausführen, um den Fehler wiederholen zu können?
+    validations:
+      required: true
+  - type: textarea
+    id: expected-result
+    attributes:
+      label: Was sollte passieren?
+      description: Was sollte hier deiner Erwartung nach passieren?
+  - type: input
+    id: logs
+    attributes:
+      label: Auf welchem Server ist der Fehler aufgetreten?
+      description: Gebe bitte den Namen des Servers an, auf dem der Fehler aufgetreten ist. z.B. "Lobby", "Lixfels Bauserver" etc.
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Sollte es ein Visuelles Problem geben, kannst du hier Screenshots hinzufügen.
@@ -0,0 +1 @@
+blank_issues_enabled: true
@@ -0,0 +1,17 @@
+name: Feature Idee
+about: Du hast eine Idee für ein neues Feature, welches SteamWar nicht hat? Stelle sie hier vor.
+labels: ["typ/idee"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature Beschreibung
+      placeholder: |
+        Ich glaube, dass ...
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Wenn es sich um etwas grafisches handelt, kannst du hier Screenshots hinzufügen.
@@ -0,0 +1,193 @@
+name: Backport CommonCore
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  BACKPORT_PATH: CommonCore
+  BACKPORT_BRANCH_PREFIX: backport/commoncore
+  DISABLE_BACKPORT_LABEL: no-backport
+
+jobs:
+  backport:
+    name: Create CommonCore backport PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Check backport eligibility
+        id: eligibility
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+        run: |
+          set -euo pipefail
+
+          api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
+
+          echo "Backport debug: event=${GITHUB_EVENT_NAME:-unknown}"
+          echo "Backport debug: server=${GITHUB_SERVER_URL}"
+          echo "Backport debug: api=${api_url}"
+          echo "Backport debug: repository=${GITHUB_REPOSITORY}"
+          echo "Backport debug: action=$(jq -r '.action // ""' "$GITHUB_EVENT_PATH")"
+
+          merged="$(jq -r '.pull_request.merged // (.pull_request.merged_at != null)' "$GITHUB_EVENT_PATH")"
+          base_branch="$(jq -r '.pull_request.base.ref' "$GITHUB_EVENT_PATH")"
+          has_disable_label="$(jq -r --arg disable_backport_label "$DISABLE_BACKPORT_LABEL" 'any(.pull_request.labels[]?; .name == $disable_backport_label)' "$GITHUB_EVENT_PATH")"
+          echo "Backport debug: pr=$(jq -r '.pull_request.number // ""' "$GITHUB_EVENT_PATH") base=${base_branch} merged=${merged}"
+          echo "Backport debug: disable label present=${has_disable_label}"
+
+          {
+            echo "should_backport=$([[ "$merged" == "true" && "$base_branch" == "main" && "$has_disable_label" != "true" ]] && echo true || echo false)"
+            echo "pr_number=$(jq -r '.pull_request.number' "$GITHUB_EVENT_PATH")"
+            echo "pr_title<<EOF"
+            jq -r '.pull_request.title' "$GITHUB_EVENT_PATH"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+          labels="$(curl -fsS \
+            -H "Accept: application/json" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            "${api_url}/repos/${GITHUB_REPOSITORY}/labels")"
+
+          if ! jq -e --arg disable_backport_label "$DISABLE_BACKPORT_LABEL" 'any(.[]; .name == $disable_backport_label)' <<< "$labels" >/dev/null; then
+            curl -fsS -X POST \
+              -H "Accept: application/json" \
+              -H "Authorization: token ${GITHUB_TOKEN}" \
+              -H "Content-Type: application/json" \
+              -d "$(jq -n --arg name "$DISABLE_BACKPORT_LABEL" --arg color "ededed" --arg description "Disable automatic CommonCore backporting for this pull request." '{name: $name, color: $color, description: $description}')" \
+              "${api_url}/repos/${GITHUB_REPOSITORY}/labels"
+          fi
+
+      - name: Create backport pull requests
+        if: steps.eligibility.outputs.should_backport == 'true'
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+          PR_NUMBER: ${{ steps.eligibility.outputs.pr_number }}
+          PR_TITLE: ${{ steps.eligibility.outputs.pr_title }}
+        run: |
+          set -euo pipefail
+
+          api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
+          repo_api_path="/repos/${GITHUB_REPOSITORY}"
+
+          api_request() {
+            local method="$1"
+            local path="$2"
+            local output="$3"
+            local data_file="${4:-}"
+            local status
+            local args=(-sS -X "$method" -H "Accept: application/json" -H "Authorization: token ${GITHUB_TOKEN}" -w "%{http_code}" -o "$output")
+
+            if [[ -n "$data_file" ]]; then
+              args+=(-H "Content-Type: application/json" --data-binary "@${data_file}")
+            fi
+
+            echo "Backport debug: ${method} ${path}"
+            if ! status="$(curl "${args[@]}" "${api_url}${path}")"; then
+              echo "Backport debug: ${method} ${path} failed before HTTP status was captured."
+              if [[ -s "$output" ]]; then
+                echo "Backport debug: response body:"
+                cat "$output"
+              fi
+              return 1
+            fi
+
+            echo "Backport debug: ${method} ${path} -> HTTP ${status}"
+            if [[ ! "$status" =~ ^2 ]]; then
+              echo "Backport debug: response body:"
+              cat "$output"
+              return 1
+            fi
+          }
+
+          echo "Backport debug: event=${GITHUB_EVENT_NAME:-unknown}"
+          echo "Backport debug: server=${GITHUB_SERVER_URL}"
+          echo "Backport debug: api=${api_url}"
+          echo "Backport debug: repository=${GITHUB_REPOSITORY}"
+          echo "Backport debug: pr=${PR_NUMBER}"
+          echo "Backport debug: actor=${GITHUB_ACTOR:-unknown}"
+
+          git config user.name "SteamWar Backport Bot"
+          git config user.email "actions@steamwar.de"
+
+          if [[ "${GITHUB_SERVER_URL}" == https://* ]]; then
+            auth_host="${GITHUB_SERVER_URL#https://}"
+            git remote set-url origin "https://oauth2:${GITHUB_TOKEN}@${auth_host}/${GITHUB_REPOSITORY}.git"
+          fi
+
+          git fetch --prune origin '+refs/heads/version/*:refs/remotes/origin/version/*'
+
+          api_request GET "${repo_api_path}" repo-debug.json
+          jq -r '"Backport debug: repo permissions admin=\(.permissions.admin // "unknown") push=\(.permissions.push // "unknown") pull=\(.permissions.pull // "unknown")"' repo-debug.json || true
+
+          echo "Backport debug: GET ${repo_api_path}/pulls/${PR_NUMBER}.diff"
+          curl -fsSL -w "Backport debug: GET ${repo_api_path}/pulls/${PR_NUMBER}.diff -> HTTP %{http_code}\n" \
+            -H "Accept: text/plain" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            "${api_url}${repo_api_path}/pulls/${PR_NUMBER}.diff" \
+            -o pull-request.diff
+
+          if ! grep -Eq "^diff --git a/${BACKPORT_PATH}/" pull-request.diff; then
+            echo "Pull request #${PR_NUMBER} has no ${BACKPORT_PATH} changes to backport."
+            exit 0
+          fi
+
+          mapfile -t target_branches < <(git for-each-ref --format='%(refname:strip=3)' refs/remotes/origin/version)
+          if [[ "${#target_branches[@]}" -eq 0 ]]; then
+            echo "No version/* branches found."
+            exit 0
+          fi
+
+          for target_branch in "${target_branches[@]}"; do
+            safe_target="${target_branch//\//-}"
+            backport_branch="${BACKPORT_BRANCH_PREFIX}/pr-${PR_NUMBER}-to-${safe_target}"
+
+            git checkout -B "${backport_branch}" "origin/${target_branch}"
+            git reset --hard "origin/${target_branch}"
+
+            if ! git apply --3way --index --include="${BACKPORT_PATH}/**" pull-request.diff; then
+              echo "Failed to apply CommonCore backport for ${target_branch}."
+              exit 1
+            fi
+
+            if git diff --cached --quiet; then
+              echo "CommonCore changes from #${PR_NUMBER} are already present in ${target_branch}."
+              continue
+            fi
+
+            git commit -m "Backport CommonCore changes from #${PR_NUMBER}" -m "${PR_TITLE}"
+            git push --force-with-lease origin "${backport_branch}"
+
+            api_request GET "${repo_api_path}/pulls?state=open" open-pulls.json
+            open_pr_number="$(jq -r --arg base "$target_branch" --arg head "$backport_branch" '[.[] | select(.base.ref == $base and .head.ref == $head) | (.number // .index)][0] // empty' open-pulls.json)"
+
+            if [[ -n "$open_pr_number" ]]; then
+              echo "Backport PR #${open_pr_number} already exists for ${target_branch}."
+              continue
+            fi
+
+            pr_body="$(printf 'Automatic CommonCore backport of #%s.\n\nOriginal PR title: %s\n\nOnly files below `CommonCore/` are included.' "$PR_NUMBER" "$PR_TITLE")"
+
+            jq -n \
+              --arg base "$target_branch" \
+              --arg head "$backport_branch" \
+              --arg title "Backport CommonCore changes from #${PR_NUMBER} to ${target_branch}" \
+              --arg body "$pr_body" \
+              '{base: $base, head: $head, title: $title, body: $body}' > create-pull.json
+
+            echo "Backport debug: create PR base=${target_branch} head=${backport_branch}"
+            api_request POST "${repo_api_path}/pulls" create-pull-response.json create-pull.json
+          done
@@ -0,0 +1,145 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - version/*
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+      - name: Setup Java 8
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Setup Java 11
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Setup Java 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 21
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+      - name: Setup Maven Repository
+        env:
+          SW_MAVEN_CREDENTIALS: ${{ secrets.SW_MAVEN_CREDENTIALS }}
+        run: |
+          echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon
+
+      - name: Stage deploy artifacts
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          rm -rf deploy
+          mkdir -p deploy
+
+          cp "BauSystem/build/libs/BauSystem-all.jar" "deploy/BauSystem.jar"
+          cp "LegacyBauSystem/build/libs/LegacyBauSystem.jar" "deploy/BauSystem-1.12.jar"
+          cp "FightSystem/build/libs/FightSystem-all.jar" "deploy/FightSystem.jar"
+          cp "KotlinCore/build/libs/KotlinCore-all.jar" "deploy/KotlinCore.jar"
+          cp "TNTLeague/build/libs/TNTLeague.jar" "deploy/TNTLeague.jar"
+          cp "LobbySystem/build/libs/LobbySystem.jar" "deploy/LobbySystem.jar"
+          cp "MissileWars/build/libs/MissileWars.jar" "deploy/MissileWars.jar"
+          cp "Realtime/build/libs/Realtime.jar" "deploy/RealTime.jar"
+          cp "SchematicSystem/build/libs/SchematicSystem-all.jar" "deploy/SchematicSystem.jar"
+          cp "SpigotCore/build/libs/SpigotCore-all.jar" "deploy/SpigotCore.jar"
+          cp "Teamserver/build/libs/Teamserver.jar" "deploy/Builder.jar"
+          cp "TowerRun/build/libs/TowerRun.jar" "deploy/TowerRun.jar"
+          cp "VelocityCore/Persistent/build/libs/Persistent.jar" "deploy/PersistentVelocityCore.jar"
+          cp "VelocityCore/Dependencies/build/libs/Dependencies-all.jar" "deploy/DependenciesVelocityCore.jar"
+          cp "VelocityCore/build/libs/VelocityCore-all.jar" "deploy/VelocityCore.jar"
+          cp "WebsiteBackend/build/libs/WebsiteBackend-all.jar" "deploy/website-api.jar"
+          cp "CLI/build/distributions/sw.zip" "deploy/sw.zip"
+
+      - name: Upload deploy artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: steamwar-jars
+          path: deploy/
+
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download deploy artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: steamwar-jars
+          path: deploy
+
+      - name: Resolve deploy target
+        id: target
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          if [[ "${GITHUB_REF_NAME}" == "main" ]]; then
+            echo "path=/jars/current" >> "$GITHUB_OUTPUT"
+          elif [[ "${GITHUB_REF_NAME}" == version/* ]]; then
+            version="${GITHUB_REF_NAME#version/}"
+            if [[ ! "$version" =~ ^[A-Za-z0-9._-]+$ ]]; then
+              echo "Unsupported version branch name: ${GITHUB_REF_NAME}" >&2
+              exit 1
+            fi
+            echo "path=/jars/${version}" >> "$GITHUB_OUTPUT"
+          else
+            echo "Unsupported deployment branch: ${GITHUB_REF_NAME}" >&2
+            exit 1
+          fi
+
+      - name: Upload jars with scp
+        shell: bash
+        env:
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
+          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+          DEPLOY_PATH: ${{ steps.target.outputs.path }}
+        run: |
+          set -euo pipefail
+
+          : "${DEPLOY_HOST:?Missing DEPLOY_HOST secret}"
+          : "${DEPLOY_USER:?Missing DEPLOY_USER secret}"
+          : "${DEPLOY_SSH_KEY:?Missing DEPLOY_SSH_KEY secret}"
+
+          port="${DEPLOY_PORT:-22}"
+
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          echo "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
+          chmod 600 ~/.ssh/deploy_key
+          ssh-keyscan -p "$port" "$DEPLOY_HOST" >> ~/.ssh/known_hosts
+
+          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH'"
+          scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/"
+      - name: Restart Services
+        shell: bash
+        env:
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
+          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+        run: |
+          set -euo pipefail
+          
+          ssh -i ~/.ssh/deploy_key -p "$DEPLOY_PORT" "${DEPLOY_USER}@${DEPLOY_HOST}" "sudo systemctl restart api.service"
+          ssh -i ~/.ssh/deploy_key -p "$DEPLOY_PORT" "${DEPLOY_USER}@${DEPLOY_HOST}" "unzip -o /jars/current/sw.zip -d /jars"
@@ -0,0 +1,76 @@
+name: Pull Request Build
+
+on:
+  pull_request:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+      - name: Setup Java 8
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Setup Java 11
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Setup Java 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 21
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+      - name: Setup Maven Repository
+        env:
+          SW_MAVEN_CREDENTIALS: ${{ secrets.SW_MAVEN_CREDENTIALS }}
+        run: |
+          echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon
+
+      - name: Merge successful backport PR
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+          BACKPORT_BRANCH_PREFIX: backport/commoncore
+        run: |
+          set -euo pipefail
+
+          head_branch="$(jq -r '.pull_request.head.ref // ""' "$GITHUB_EVENT_PATH")"
+          base_branch="$(jq -r '.pull_request.base.ref // ""' "$GITHUB_EVENT_PATH")"
+          pr_number="$(jq -r '.pull_request.number' "$GITHUB_EVENT_PATH")"
+
+          if [[ "${head_branch}" != "${BACKPORT_BRANCH_PREFIX}/"* ]]; then
+            echo "Not a CommonCore backport PR."
+            exit 0
+          fi
+
+          if [[ "${base_branch}" != version/* ]]; then
+            echo "Backport PR target is not a version/* branch."
+            exit 0
+          fi
+
+          api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
+
+          curl -fsS -X POST \
+            -H "Accept: application/json" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d '{"Do":"merge","delete_branch_after_merge":true}' \
+            "${api_url}/repos/${GITHUB_REPOSITORY}/pulls/${pr_number}/merge"
@@ -21,4 +21,4 @@ lib
 /WebsiteBackend/logs
 /WebsiteBackend/skins
 /WebsiteBackend/config.json
-/WebsiteBackend/sessions
+/WebsiteBackend/sessions
@@ -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);
+        }
+    }
+}
@@ -67,11 +67,7 @@ public class TNTListener implements Listener, ScoreboardElement {

    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onExplode(EntityExplodeEvent event) {
-        if (!(event.getEntity() instanceof TNTPrimed)) {
-            event.blockList().clear();
-            return;
-        }
-        explode(event.blockList(), true);
+        explode(event.blockList(), event.getEntity() instanceof TNTPrimed);
    }

    @Override
@@ -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
     */
@@ -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)
+}
@@ -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)
@@ -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"))
+    }
+}
@@ -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!")
+        }
+    }
+}
@@ -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) }
+                }
+            }
+        )
+    }
+}
@@ -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!")))
+    }
+}
@@ -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()
+    }
+}
@@ -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"
+}
@@ -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"
+}
@@ -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
+                                )
+                            }
+                        }
+                    })
+                }
+            }
+        )
+
+    }
+}
@@ -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) }
+            }
+        })
+    }
+}
@@ -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)
+}
@@ -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>
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -28,11 +28,11 @@ import org.jetbrains.exposed.v1.javatime.timestamp
 import java.time.Instant

 object AuditLogTable: IntIdTable("AuditLog", "AuditLogId") {
-    val time = timestamp("Time")
-    val server = varchar("ServerName", 255)
-    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable()
-    val actor = reference("Actor", SteamwarUserTable)
-    val action = enumerationByName("ActionType", 255, AuditLog.Type::class)
+    val time = timestamp("Time").index()
+    val server = varchar("ServerName", 255).index()
+    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable().index()
+    val actor = reference("Actor", SteamwarUserTable).index()
+    val action = enumerationByName("ActionType", 255, AuditLog.Type::class).index()
    val actionText = text("ActionText")
 }

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -33,8 +33,8 @@ import java.sql.Timestamp
 import java.time.Instant

 object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
-    val userId = reference("UserID", SteamwarUserTable)
-    val timestamp = timestamp("Timestamp")
+    val userId = reference("UserID", SteamwarUserTable).index()
+    val timestamp = timestamp("Timestamp").index()
    val ip = varchar("IP", 45).entityId()

    init {
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
 import java.util.*

 object BauweltMemberTable: CompositeIdTable("BauweltMember") {
-    val bauweltId = reference("BauweltID", SteamwarUserTable)
-    val memberId = reference("MemberID", SteamwarUserTable)
+    val bauweltId = reference("BauweltID", SteamwarUserTable).index()
+    val memberId = reference("MemberID", SteamwarUserTable).index()
    val build = bool("Build")
    val worldEdit = bool("WorldEdit")
    val world = bool("World")
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -20,6 +20,7 @@
 package de.steamwar.sql

 import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.SortOrder
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
@@ -34,19 +35,23 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
 import java.sql.Timestamp

 object CheckedSchematicTable: CompositeIdTable("CheckedSchematic") {
-    val nodeId = optReference("NodeId", SchematicNodeTable)
-    val nodeOwner = reference("NodeOwner", SteamwarUserTable)
-    val nodeName = varchar("NodeName", 64).entityId()
-    val validator = reference("Validator", SteamwarUserTable)
-    val startTime = timestamp("StartTime").entityId()
+    val nodeId = optReference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL, onUpdate = ReferenceOption.SET_NULL).index()
+    val nodeOwner = reference("NodeOwner", SteamwarUserTable).index()
+    val nodeName = varchar("NodeName", 64).entityId().index()
+    val validator = reference("Validator", SteamwarUserTable).index()
+    val startTime = timestamp("StartTime").entityId().index()
    val endTime = timestamp("EndTime")
    val declineReason = text("DeclineReason")
-    val seen = bool("Seen")
+    val seen = bool("Seen").index()
    val nodeType = varchar("NodeType", 16)

    init {
        addIdColumn(nodeOwner)
        addIdColumn(nodeName)
+
+        index(false, nodeOwner, endTime)
+        index(false, startTime, endTime, nodeName)
+        index(false, seen, nodeOwner, startTime)
    }
 }

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -36,8 +36,8 @@ import java.time.Instant
 object EventTable : IntIdTable("Event", "EventId") {
    val name = varchar("EventName", 100).uniqueIndex()
    val deadline = timestamp("Deadline")
-    val start = timestamp("Start")
-    val end = timestamp("End")
+    val start = timestamp("Start").index()
+    val end = timestamp("End").index()
    val maxPlayers = integer("MaximumTeamMembers")
    val schemType = varchar("SchemType", 16).nullable()
    val publicsOnly = bool("PublicSchemsOnly")
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -33,17 +33,17 @@ import java.time.Instant
 import java.util.*

 object EventFightTable : IntIdTable("EventFight", "FightID") {
-    val eventId = reference("EventID", EventTable)
-    val startTime = timestamp("StartTime")
+    val eventId = reference("EventID", EventTable).index()
+    val startTime = timestamp("StartTime").index()
    val gamemode = text("Spielmodus")
    val map = text("Map")
-    val groupId = optReference("GroupId", EventGroupTable)
-    val teamBlue = reference("TeamBlue", TeamTable)
-    val teamRed = reference("TeamRed", TeamTable)
+    val groupId = optReference("GroupId", EventGroupTable).index()
+    val teamBlue = reference("TeamBlue", TeamTable).index()
+    val teamRed = reference("TeamRed", TeamTable).index()
    val spectatePort = integer("SpectatePort").nullable()
    val bestOf = integer("BestOf")
    val ergebnis = integer("Ergebnis")
-    val fight = optReference("Fight", FightTable)
+    val fight = optReference("Fight", FightTable).index()
 }

 class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {
@@ -34,6 +34,10 @@ object EventGroupTable : IntIdTable("EventGroup", "Id") {
    val pointsPerWin = integer("PointsPerWin").default(3)
    val pointsPerLoss = integer("PointsPerLoss").default(0)
    val pointsPerDraw = integer("PointsPerDraw").default(1)
+
+    init {
+        uniqueIndex(event, name)
+    }
 }

 class EventGroup(id: EntityID<Int>) : IntEntity(id) {
@@ -90,7 +94,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
@@ -29,7 +29,7 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
 import org.jetbrains.exposed.v1.jdbc.select

 object EventRelationTable : IntIdTable("EventRelation") {
-    val fightId = reference("FightId", EventFightTable)
+    val fightId = reference("FightId", EventFightTable).index()
    val fightTeam = enumeration("FightTeam", EventRelation.FightTeam::class)
    val fromType = enumeration("FromType", EventRelation.FromType::class)
    val fromId = integer("FromId")
@@ -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 {
@@ -34,14 +34,14 @@ import org.jetbrains.exposed.v1.jdbc.update
 import java.sql.Timestamp

 object FightTable : IntIdTable("Fight", "FightId") {
-    val gamemode = varchar("Gamemode", 30)
+    val gamemode = varchar("Gamemode", 30).index()
    val server = text("Server")
    val startTime = timestamp("StartTime")
    val duration = integer("Duration")
-    val blueLeader = reference("BlueLeader", SteamwarUserTable)
-    val redLeader = reference("RedLeader", SteamwarUserTable)
-    val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
-    val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
+    val blueLeader = reference("BlueLeader", SteamwarUserTable).index()
+    val redLeader = reference("RedLeader", SteamwarUserTable).index()
+    val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
+    val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
    val win = enumeration("Win", Fight.WinningTeam::class)
    val winCondition = varchar("WinCondition", 100)
    val replayAvailable = bool("ReplayAvailable")
@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore

 object FightPlayerTable : CompositeIdTable("FightPlayer") {
    val fightId = reference("FightId", FightTable)
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()
    val team = integer("Team")
    val kit = varchar("Kit", 64)
    val kills = integer("Kills")
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -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);
@@ -30,8 +30,8 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass
 import java.util.*

 object IgnoreSystemTable: CompositeIdTable("IgnoredPlayers") {
-    val ignorer = reference("Ignorer", SteamwarUserTable)
-    val ignored = reference("Ignored", SteamwarUserTable)
+    val ignorer = reference("Ignorer", SteamwarUserTable).index()
+    val ignored = reference("Ignored", SteamwarUserTable).index()

    override val primaryKey = PrimaryKey(ignorer, ignored)

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -35,7 +35,7 @@ import java.io.InputStream
 import java.util.zip.GZIPInputStream

 object NodeDataTable: CompositeIdTable("NodeData") {
-    val nodeId = reference("NodeId", SchematicNodeTable)
+    val nodeId = reference("NodeId", SchematicNodeTable).index()
    val createdAt = timestamp("CreatedAt").defaultExpression(CurrentTimestamp).entityId()
    val nodeFormat = enumeration("NodeFormat", NodeData.SchematicFormat::class)
    val schemData = blob("SchemData")
@@ -20,6 +20,7 @@
 package de.steamwar.sql

 import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IdTable
 import org.jetbrains.exposed.v1.core.eq
@@ -32,8 +33,8 @@ import java.sql.Timestamp
 import java.time.Instant

 object NodeDownloadTable: IdTable<Int>("NodeDownload") {
-    override val id = reference("NodeId", SchematicNodeTable).uniqueIndex()
-    val link = varchar("Link", 255)
+    override val id = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE).uniqueIndex()
+    val link = varchar("Link", 255).uniqueIndex()
    val timestamp = timestamp("Timestamp").defaultExpression(CurrentTimestamp)
 }

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -20,6 +20,7 @@
 package de.steamwar.sql

 import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.ReferenceOption
 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
@@ -32,9 +33,9 @@ import java.util.*
 import kotlin.jvm.optionals.getOrNull

 object NodeMemberTable : CompositeIdTable("NodeMember") {
-    val node = reference("NodeId", SchematicNodeTable)
-    val userId = reference("UserId", SteamwarUserTable)
-    val parentNode = optReference("ParentId", SchematicNodeTable)
+    val node = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE, onUpdate = ReferenceOption.CASCADE).index()
+    val userId = reference("UserId", SteamwarUserTable).index()
+    val parentNode = optReference("ParentId", SchematicNodeTable).index()

    override val primaryKey = PrimaryKey(node, userId)

@@ -41,6 +41,7 @@ object PersonalKitTable: CompositeIdTable("PersonalKit") {

    init {
        addIdColumn(userId)
+        index(false, userId, gamemode)
    }
 }

@@ -34,12 +34,16 @@ import java.util.function.Consumer

 object PunishmentTable : IntIdTable("Punishments", "PunishmentId") {
    val userId = reference("UserId", SteamwarUserTable)
-    val punisher = reference("Punisher", SteamwarUserTable)
+    val punisher = reference("Punisher", SteamwarUserTable).index()
    val type = enumerationByName("Type", 32, Punishment.PunishmentType::class)
    val startTime = timestamp("StartTime")
    val endTime = timestamp("EndTime")
    val perma = bool("Perma")
    val reason = text("Reason")
+
+    init {
+        index(false, userId, type)
+    }
 }

 class Punishment(id: EntityID<Int>) : IntEntity(id) {
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass

 object RefereeTable: CompositeIdTable("Referee") {
    val eventId = reference("EventId", EventTable)
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()

    override val primaryKey = PrimaryKey(eventId, userId)

@@ -36,8 +36,5 @@ public interface SQLWrapper<M> {
        return Collections.emptyList();
    }

-    default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
-    }
-
    void additionalExceptionMetadata(StringBuilder builder);
 }
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -34,13 +34,17 @@ import java.util.*
 import java.util.function.Consumer

 object SchematicNodeTable : IntIdTable("SchematicNode", "NodeId") {
-    val owner = reference("NodeOwner", SteamwarUserTable)
+    val owner = reference("NodeOwner", SteamwarUserTable).index()
    val name = varchar("NodeName", 64)
-    val parent = optReference("ParentNode", SchematicNodeTable)
+    val parent = optReference("ParentNode", SchematicNodeTable).index()
    val lastUpdate = timestamp("LastUpdate").defaultExpression(CurrentTimestamp)
    val item = text("NodeItem")
-    val type = varchar("NodeType", 16).nullable()
+    val type = varchar("NodeType", 16).nullable().index()
    val config = integer("Config")
+
+    init {
+        uniqueIndex(parent, owner, name)
+    }
 }

 class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
@@ -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,
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -28,9 +28,13 @@ import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass

 object ScriptTable: IntIdTable("Script") {
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()
    val name = varchar("Name", 64)
    val code = text("Code")
+
+    init {
+        uniqueIndex(userId, name)
+    }
 }

 class Script(id: EntityID<Int>) : IntEntity(id) {
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
 import java.sql.Timestamp

 object SessionTable: Table("Session") {
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()
    val startTime = timestamp("StartTime")
    val endTime = timestamp("EndTime").defaultExpression(CurrentTimestamp)
 }
@@ -37,15 +37,15 @@ import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec

 object SteamwarUserTable : IntIdTable("UserData", "id") {
-    val uuid = varchar("UUID", 36)
-    val username = varchar("UserName", 32)
-    val team = reference("Team", TeamTable)
+    val uuid = varchar("UUID", 36).uniqueIndex()
+    val username = varchar("UserName", 32).index()
+    val team = reference("Team", TeamTable).index()
    val leader = bool("Leader")
    val locale = varchar("Locale", 16).nullable()
    val manualLocale = bool("ManualLocale")
    val bedrock = bool("Bedrock")
    val password = text("Password").nullable()
-    val discordId = long("DiscordId").nullable()
+    val discordId = long("DiscordId").nullable().uniqueIndex()
 }

 class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
@@ -198,7 +198,7 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {

    var discordId by SteamwarUserTable.discordId

-    val punishments by lazy { Punishment.getPunishmentsOfPlayer(id.value) }
+    private val punishments by lazy { Punishment.getPunishmentsOfPlayer(id.value) }
    private val perms by lazy { UserPerm.getPerms(id.value) }
    private val prefix by lazy { perms.firstOrNull { UserPerm.prefixes.containsKey(it) }?.let { UserPerm.prefixes[it]} ?: UserPerm.emptyPrefix }

@@ -28,9 +28,9 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
 import org.jetbrains.exposed.v1.jdbc.select

 object TeamTable : IntIdTable("Team", "TeamID") {
-    val kuerzel = varchar("TeamKuerzel", 10)
+    val kuerzel = varchar("TeamKuerzel", 10).index()
    val color = char("TeamColor", 1).default("8")
-    val name = varchar("TeamName", 16)
+    val name = varchar("TeamName", 16).index()
    val deleted = bool("TeamDeleted").default(false)
 }

@@ -66,7 +66,6 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
    var deleted by TeamTable.deleted
        private set
    val members by lazy { useDb { SteamwarUserTable.select(SteamwarUserTable.id).where { SteamwarUserTable.team eq teamId }.map { it[SteamwarUserTable.id].value } } }
-    val membersUser by lazy { useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.toList() } }

    fun size() = useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.count().toInt() }
    fun disband(user: SteamwarUser) = useDb {
@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.deleteWhere
 import org.jetbrains.exposed.v1.jdbc.insertIgnore

 object TeamTeilnahmeTable : CompositeIdTable("TeamTeilnahme") {
-    val teamId = reference("teamId", TeamTable)
-    val eventId = reference("eventId", EventTable)
+    val teamId = reference("teamId", TeamTable).index()
+    val eventId = reference("eventId", EventTable).index()
    val placement = integer("Placement").nullable()

    override val primaryKey = PrimaryKey(teamId, eventId)
@@ -79,7 +79,7 @@ class TeamTeilnahme(id: EntityID<CompositeID>) : CompositeEntity(id) {

        @JvmStatic
        fun getEvents(teamId: Int) = useDb {
-            find { TeamTeilnahmeTable.teamId eq teamId }.mapNotNull { Event.byId(it.eventId.value) }.toSet()
+            find { TeamTeilnahmeTable.teamId eq teamId }.map { Event.byId(it.eventId.value) }.toSet()
        }

        @JvmStatic
@@ -33,10 +33,10 @@ import java.sql.Timestamp
 import java.util.*

 object TokenTable: IntIdTable("Token") {
-    val name = varchar("Name", 64)
-    val owner = reference("Owner", SteamwarUserTable)
+    val name = varchar("Name", 64).uniqueIndex()
+    val owner = reference("Owner", SteamwarUserTable).index()
    val created = timestamp("Created").defaultExpression(CurrentTimestamp)
-    val hash = varchar("Hash", 88)
+    val hash = varchar("Hash", 88).uniqueIndex()
 }

 class Token(id: EntityID<Int>): IntEntity(id) {
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
 import org.jetbrains.exposed.v1.jdbc.selectAll

 object UserPermTable: Table("UserPerm") {
-    val user = reference("User", SteamwarUserTable.id)
+    val user = reference("User", SteamwarUserTable.id).index()
    val perm = enumerationByName("Perm", 32, UserPerm::class)

    override val primaryKey = PrimaryKey(user, perm)
@@ -67,7 +67,7 @@ object KotlinDatabase {
    }
 }

-fun <T: Any?> useDb(statement: JdbcTransaction.() -> T): T {
+fun <T> useDb(statement: JdbcTransaction.() -> T): T {
    KotlinDatabase.ensureConnected()
    return TransactionManager.currentOrNull()?.statement() ?: transaction(KotlinDatabase.db) {
        statement()
@@ -42,4 +42,5 @@ dependencies {

    compileOnly(libs.fastutil)
    compileOnly(libs.authlib)
+    compileOnly(project(":FightSystem:FightSystem_14"))
 }
@@ -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();
+            }
+        });
+    }
+}
@@ -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();
+    }
+}
@@ -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
@@ -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 {
+}
@@ -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();
@@ -181,7 +181,12 @@ public class Permanent implements Listener {

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onExplosion(EntityExplodeEvent e) {
-        if (!(e.getEntity() instanceof TNTPrimed)) return;
+        if (!(e.getEntity() instanceof TNTPrimed)) {
+            if (Config.GameModeConfig.Schematic.Type.toDB().equals("wargearseason26")) {
+                e.blockList().clear();
+            }
+            return;
+        }
        if (!Config.GameModeConfig.Arena.WaterDamage) return;
        e.blockList().removeIf(block -> {
            if(block.getType() == Material.TNT) {
@@ -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);
@@ -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 {
+    }
+}
@@ -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)
+}
@@ -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();
+    }
+}
@@ -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;
+    }
+}
@@ -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}]
@@ -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}]
@@ -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<>();
    }
@@ -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());
        });
@@ -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"))
 }
@@ -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: ");
@@ -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);
            }
@@ -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,60 @@ 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 as well as adding the original owner on the schematic
+                node.setSchemtype(GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type);
+                NodeMember.createNodeMember(node.getNodeId(), schematic.getOwner());
+
+                // Remove any added players from the schematic in the folder
+                for (SchematicNode schematicNode : SchematicNode.getSchematicNodeInNode(teamFolder.getNodeId())) {
+                    if (schematicNode.getNodeId() == node.getNodeId()) continue;
+                    for (NodeMember nodeMember : NodeMember.getNodeMembers(schematicNode.getNodeId())) {
+                        NodeMember.createNodeMember(node.getNodeId(), nodeMember.getMember());
+                        nodeMember.delete();
+                    }
+                }
+
+                // 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()),
@@ -50,7 +50,7 @@ public class WhoisCommand extends SWCommand {

    @Register(description = "WHOIS_USAGE")
    public void whois(Chatter sender, long id, WhoisParameterTypes... parameters) {
-        if(!sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
+        if(!sender.user().hasPerm(UserPerm.ADMINISTRATION) && !sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) {
            sender.system("UNKNOWN_PLAYER");
            return;
        }
@@ -26,6 +26,7 @@ import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.listeners.ChannelListener;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.Webhook;
 import net.dv8tion.jda.api.entities.WebhookClient;
@@ -104,10 +105,16 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
                return;
            }

-            String avatarUrl;
+            String avatarUrl = null;
            if (user.getDiscordId() != null) {
-                avatarUrl = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()).complete().getEffectiveAvatarUrl();
-            } else {
+                Member member = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId())
+                        .onErrorMap(throwable -> null)
+                        .complete();
+                if (member != null) {
+                    avatarUrl = member.getEffectiveAvatarUrl();
+                }
+            }
+            if (avatarUrl == null) {
                avatarUrl = DiscordBot.getInstance().getJda().getSelfUser().getAvatarUrl();
            }

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

@@ -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);
@@ -47,67 +47,61 @@ data class UsernamePassword(val name: String, val password: String, val keepLogg

 fun Route.configureAuth() {
    route("/auth") {
+        val client = HttpClient(Java) {
+            install(ContentNegotiation) {
+                json()
+            }
+        }
+
+        post {
+            val request = call.receive<UsernamePassword>()
+
+            SteamwarUser.clear()
+            val user = SteamwarUser.get(request.name)
+            val valid = user?.verifyPassword(request.password) ?: false
+
+            if (!valid) {
+                call.respond(HttpStatusCode.Forbidden, ResponseError("Invalid username or password", "invalid"))
+                return@post
+            }
+
+            call.sessions.set(SWUserSession(user.getId()))
+            call.respond(ResponseUser(user))
+        }

        delete {
            call.sessions.clear<SWUserSession>()
            call.respond(HttpStatusCode.NoContent)
        }

-        configureDiscordAuth()
-        configurePasswordAuth()
-    }
-}
+        route("/discord") {
+            post {
+                val token = call.receiveText()

-fun Route.configurePasswordAuth() {
-    post {
-        val request = call.receive<UsernamePassword>()
+                val res = client.get("https://discord.com/api/v10/oauth2/@me") {
+                    headers {
+                        append("Authorization", "Bearer $token")
+                    }
+                }
+                val resJson = Json.parseToJsonElement(res.bodyAsText()).jsonObject
+                val discordId = resJson["user"]?.jsonObject["id"]?.jsonPrimitive?.content

-        SteamwarUser.clear()
-        val user = SteamwarUser.get(request.name)
-        val valid = user?.verifyPassword(request.password) ?: false
+                if (discordId == null) {
+                    call.respond(HttpStatusCode.Forbidden, ResponseError("Invalid Discord token", "invalid"))
+                    return@post
+                }

-        if (!valid) {
-            call.respond(HttpStatusCode.Forbidden, ResponseError("Invalid username or password", "invalid"))
-            return@post
-        }
+                SteamwarUser.clear()
+                val user = SteamwarUser.get(discordId.toLong())

-        call.sessions.set(SWUserSession(user.getId()))
-        call.respond(ResponseUser(user))
-    }
-}
+                if (user == null) {
+                    call.respond(HttpStatusCode.Forbidden, ResponseError("Discord account not linked", "not_linked"))
+                    return@post
+                }

-fun Route.configureDiscordAuth() {
-    val client = HttpClient(Java) {
-        install(ContentNegotiation) {
-            json()
-        }
-    }
-
-    post("/discord") {
-        val token = call.receiveText()
-
-        val res = client.get("https://discord.com/api/v10/oauth2/@me") {
-            headers {
-                append("Authorization", "Bearer $token")
+                call.sessions.set(SWUserSession(user.getId()))
+                call.respond(ResponseUser(user))
            }
        }
-        val resJson = Json.parseToJsonElement(res.bodyAsText()).jsonObject
-        val discordId = resJson["user"]?.jsonObject["id"]?.jsonPrimitive?.content
-
-        if (discordId == null) {
-            call.respond(HttpStatusCode.Forbidden, ResponseError("Invalid Discord token", "invalid"))
-            return@post
-        }
-
-        SteamwarUser.clear()
-        val user = SteamwarUser.get(discordId.toLong())
-
-        if (user == null) {
-            call.respond(HttpStatusCode.Forbidden, ResponseError("Discord account not linked", "not_linked"))
-            return@post
-        }
-
-        call.sessions.set(SWUserSession(user.getId()))
-        call.respond(ResponseUser(user))
    }
-}
+}
@@ -75,7 +75,7 @@ data class ResponseUser(
@Serializable
 data class ResponseUserList(val entries: List<ResponseUser>, val rows: Long)

-fun Query.addUserFilter(
+private fun Query.addUserFilter(
    name: String? = null,
    uuid: UUID? = null,
    team: Set<Int>? = null,
@@ -27,7 +27,6 @@ import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import kotlinx.serialization.Serializable
-import org.jetbrains.exposed.v1.core.ResultRow
 import java.sql.Timestamp
 import java.time.Instant

@@ -61,8 +60,6 @@ data class ResponseEventFight(
@Serializable
 data class ResponseTeam(val id: Int, val name: String, val kuerzel: String, val color: String) {
    constructor(team: Team) : this(team.teamId, team.teamName, team.teamKuerzel, team.teamColor)
-
-    constructor(row: ResultRow) : this(row[TeamTable.id].value, row[TeamTable.name], row[TeamTable.kuerzel], row[TeamTable.color])
 }

@Serializable
@@ -19,12 +19,6 @@

 package de.steamwar.routes

-import de.steamwar.routes.v2.configureAuthV2
-import de.steamwar.routes.v2.configureGameModeRoutes
-import de.steamwar.routes.v2.configureSchematicsV2Route
-import de.steamwar.routes.v2.configureSteamWarRoute
-import de.steamwar.routes.v2.configureTeamRoutes
-import de.steamwar.routes.v2.configureUsersRouteV2
 import io.ktor.server.application.*
 import io.ktor.server.auth.*
 import io.ktor.server.routing.*
@@ -40,17 +34,6 @@ fun Application.configureRoutes() {
            configureSchematic()
            configureAuth()
            configureAuditLog()
-            route("/v2") {
-                configureAuditLog()
-                configurePage()
-                configureEventsRoute()
-                configureAuthV2()
-                configureTeamRoutes()
-                configureSteamWarRoute()
-                configureUsersRouteV2()
-                configureSchematicsV2Route()
-                configureGameModeRoutes()
-            }
        }
    }
 }
@@ -43,31 +43,8 @@ import java.util.*
 import java.util.zip.GZIPInputStream

@Serializable
-data class ResponseSchematic(
-    val name: String,
-    val id: Int,
-    val type: String?,
-    val owner: Int,
-    val item: String,
-    val lastUpdate: Long,
-    val replaceColor: Boolean,
-    val allowReplay: Boolean,
-    val members: List<ResponseUser>
-) {
-    constructor(node: SchematicNode) : this(
-        node.name,
-        node.getId(),
-        node.schemtype.name(),
-        node.owner,
-        node.item,
-        node.lastUpdate.time,
-        node.replaceColor(),
-        node.allowReplay(),
-        node.members.map {
-            ResponseUser(
-                SteamwarUser.byId(it.member)!!
-            )
-        })
+data class ResponseSchematic(val name: String, val id: Int, val type: String?, val owner: Int, val item: String, val lastUpdate: Long, val rank: Int, val replaceColor: Boolean, val allowReplay: Boolean) {
+    constructor(node: SchematicNode) : this(node.name, node.getId(), node.schemtype?.name(), node.owner, node.item, node.lastUpdate.time, node.rank, node.replaceColor(), node.allowReplay())
 }

@Serializable
@@ -95,12 +72,9 @@ fun Route.configureSchematic() {
            val node = call.receiveSchematic() ?: return@get

            val user = call.principal<SWAuthPrincipal>()?.user
-            if (user != null && !node.accessibleByUser(user)) {
+            if(user != null && !node.accessibleByUser(user)) {
                call.respond(HttpStatusCode.Forbidden)
-                SWException.log(
-                    "User ${user.userName} tried to download schematic ${node.name} without permission",
-                    user.id.toString()
-                )
+                SWException.log("User ${user.userName} tried to download schematic ${node.name} without permission", user.id.toString())
                return@get
            }

@@ -109,15 +83,8 @@ fun Route.configureSchematic() {
                return@get
            }

-            call.response.header(
-                "Content-Disposition",
-                "attachment; filename=\"${node.name}${data.nodeFormat.fileEnding}\""
-            )
-            call.respondBytes(
-                data.schemData(false).readAllBytes(),
-                contentType = ContentType.Application.OctetStream,
-                status = HttpStatusCode.OK
-            )
+            call.response.header("Content-Disposition", "attachment; filename=\"${node.name}${data.nodeFormat.fileEnding}\"")
+            call.respondBytes(data.schemData(false).readAllBytes(), contentType = ContentType.Application.OctetStream, status = HttpStatusCode.OK)
        }
        get("/info") {
            val node = call.receiveSchematic() ?: return@get
@@ -133,22 +100,18 @@ fun Route.configureSchematic() {
            val schemName = file.name.substringBeforeLast(".")

            if (SchematicNode.invalidSchemName(arrayOf(schemName))) {
-                call.respond(
-                    HttpStatusCode.BadRequest, ResponseError(
-                        error = "INVALID_NAME"
-                    )
-                )
+                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                    error = "INVALID_NAME"
+                ))
                return@post
            }

            val schemType = file.name.substringAfterLast(".")

            if (schemType != "schem" && schemType != "schematic") {
-                call.respond(
-                    HttpStatusCode.BadRequest, ResponseError(
-                        error = "INVALID_SUFFIX"
-                    )
-                )
+                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                    error = "INVALID_SUFFIX"
+                ))
                return@post
            }

@@ -183,27 +146,22 @@ fun Route.configureSchematic() {
                            .value

                        if (fawe.equals("2.12.3-SNAPSHOT")) {
-                            SWException.log(
-                                "Schematic with Bugged Version Uploaded", """
+                            SWException.log("Schematic with Bugged Version Uploaded", """
                            Schematic=$schemName
                            User=${user.userName}
                            Id=${user.id}
-                        """.trimIndent()
-                            )
+                        """.trimIndent())
                        }
-                    } catch (_: Exception) {
-                    }
+                    } catch (_: Exception) {}
                }

                NodeData.saveFromStream(node, content.inputStream(), version)

                call.respond(ResponseSchematic(node))
            } catch (e: Exception) {
-                call.respond(
-                    HttpStatusCode.BadRequest, ResponseError(
-                        error = e.message ?: "GENERIC", code = "UPLOAD_ERROR"
-                    )
-                )
+                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                    error = e.message ?: "GENERIC", code = "UPLOAD_ERROR"
+                ))
            }
        }
    }
@@ -220,7 +178,7 @@ suspend fun ApplicationCall.receiveSchematic(fieldName: String = "code", delete:
        return null
    }

-    if (dl.timestamp.toInstant().plus(Duration.of(5, ChronoUnit.MINUTES)).isBefore(Instant.now())) {
+    if(dl.timestamp.toInstant().plus(Duration.of(5, ChronoUnit.MINUTES)).isBefore(Instant.now())) {
        respond(HttpStatusCode.Gone)
        return null
    }
@@ -1,46 +0,0 @@
-/*
- *   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.routes.v2
-
-import de.steamwar.plugins.SWUserSession
-import de.steamwar.routes.configureDiscordAuth
-import de.steamwar.routes.configurePasswordAuth
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.delete
-import io.ktor.server.routing.route
-import io.ktor.server.sessions.clear
-import io.ktor.server.sessions.sessions
-
-fun Route.configureAuthV2() {
-    route("/auth") {
-        delete {
-            call.sessions.clear<SWUserSession>()
-            call.respond(HttpStatusCode.NoContent)
-        }
-
-        configureDiscordAuth()
-        route("/legacy") {
-            configurePasswordAuth()
-        }
-    }
-}
@@ -1,55 +0,0 @@
-/*
- *   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.routes.v2
-
-import de.steamwar.ResponseError
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import io.ktor.server.routing.route
-import org.bspfsystems.yamlconfiguration.file.YamlConfiguration
-import java.io.File
-import kotlin.io.nameWithoutExtension
-
-fun Route.configureGameModeRoutes() {
-    route("/gamemodes") {
-        get {
-            call.respond(
-                File("/configs/GameModes/").listFiles()!!
-                    .filter { it.name.endsWith(".yml") && !it.name.endsWith(".kits.yml") }
-                    .map { it.nameWithoutExtension })
-        }
-        get("/{gamemode}/maps") {
-            val gamemode = call.parameters["gamemode"]
-            if (gamemode == null) {
-                call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid gamemode"))
-                return@get
-            }
-            val file = File("/configs/GameModes/$gamemode.yml")
-            if (!file.exists()) {
-                call.respond(HttpStatusCode.NotFound, ResponseError("Gamemode not found"))
-                return@get
-            }
-            call.respond(YamlConfiguration.loadConfiguration(file).getStringList("Server.Maps"))
-        }
-    }
-}
@@ -1,210 +0,0 @@
-/*
- *   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.routes.v2
-
-import com.sun.tools.jdeprscan.Main.call
-import de.steamwar.ResponseError
-import de.steamwar.plugins.SWAuthPrincipal
-import de.steamwar.plugins.SWPermissionCheck
-import de.steamwar.routes.ResponseSchematic
-import de.steamwar.routes.ResponseSchematicType
-import de.steamwar.routes.UploadSchematic
-import de.steamwar.routes.nbt
-import de.steamwar.routes.receiveSchematic
-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 de.steamwar.sql.SchematicType
-import dev.dewy.nbt.tags.collection.CompoundTag
-import io.ktor.http.ContentType
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.ApplicationCall
-import io.ktor.server.application.call
-import io.ktor.server.application.install
-import io.ktor.server.auth.authentication
-import io.ktor.server.auth.principal
-import io.ktor.server.request.receive
-import io.ktor.server.response.header
-import io.ktor.server.response.respond
-import io.ktor.server.response.respondBytes
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import io.ktor.server.routing.post
-import io.ktor.server.routing.route
-import java.io.BufferedInputStream
-import java.io.DataInputStream
-import java.util.Base64
-import java.util.zip.GZIPInputStream
-
-data class ListedSchematicNode(val name: String, val id: Int, val type: String)
-
-fun Route.configureSchematicsV2Route() {
-    route("/schematics") {
-        get("/types") {
-            call.respond(SchematicType.values().filter { !it.check() }
-                .map { ResponseSchematicType(it.name(), it.toDB()) })
-        }
-
-        get("/list/{path...}") {
-            val path = call.parameters.getAll("path")?.joinToString("/") ?: "/"
-
-            val user = call.authentication.principal<SWAuthPrincipal>()
-            if (user == null) {
-                call.respond(HttpStatusCode.Unauthorized)
-                return@get
-            }
-
-            val node = SchematicNode.getNodeFromPath(user.user, path)
-            call.respond(SchematicNode.list(user.user, node?.id?.value).map { ListedSchematicNode(it.name, it.id.value, it.schemtype.toDB()) })
-        }
-
-        get("/download/{code}") {
-            val node = call.receiveSchematic() ?: return@get
-
-            val user = call.principal<SWAuthPrincipal>()?.user
-            if(user != null && !node.accessibleByUser(user)) {
-                call.respond(HttpStatusCode.Forbidden)
-                SWException.log("User ${user.userName} tried to download schematic ${node.name} without permission", user.id.toString())
-                return@get
-            }
-
-            val data = NodeData.getLatest(node) ?: run {
-                call.respond(HttpStatusCode.InternalServerError)
-                return@get
-            }
-
-            call.response.header("Content-Disposition", "attachment; filename=\"${node.name}${data.nodeFormat.fileEnding}\"")
-            call.respondBytes(data.schemData(false).readAllBytes(), contentType = ContentType.Application.OctetStream, status = HttpStatusCode.OK)
-        }
-
-        post("/upload") {
-            val user = call.principal<SWAuthPrincipal>()?.user
-            if (user == null) {
-                call.respond(HttpStatusCode.Unauthorized)
-                return@post
-            }
-
-            val file = call.receive<UploadSchematic>()
-            val schemName = file.name.substringBeforeLast(".")
-
-            if (SchematicNode.invalidSchemName(arrayOf(schemName))) {
-                call.respond(HttpStatusCode.BadRequest, ResponseError(
-                    error = "INVALID_NAME"
-                ))
-                return@post
-            }
-
-            val schemType = file.name.substringAfterLast(".")
-
-            if (schemType != "schem" && schemType != "schematic") {
-                call.respond(HttpStatusCode.BadRequest, ResponseError(
-                    error = "INVALID_SUFFIX"
-                ))
-                return@post
-            }
-
-            var node = SchematicNode.getSchematicNode(user.getId(), schemName, null as Int?)
-            if (node == null) {
-                node = SchematicNode.createSchematic(user.getId(), schemName, null)
-            }
-
-            try {
-                val content = Base64.getDecoder().decode(file.content)
-
-                var schem = nbt.fromStream(DataInputStream(BufferedInputStream(GZIPInputStream(content.inputStream()))))
-
-                if (schem.size() == 1) schem = schem.first() as CompoundTag
-
-                val version = schem.let {
-                    if (it.contains("Materials"))
-                        return@let SchematicFormat.MCEDIT
-                    else if (it.contains("Blocks"))
-                        return@let SchematicFormat.SPONGE_V3
-                    else
-                        return@let SchematicFormat.SPONGE_V2
-                }
-
-                if (version == SchematicFormat.SPONGE_V3) {
-                    try {
-                        val fawe = schem.getCompound("Metadata")
-                            .getCompound("WorldEdit")
-                            .getString("Version")
-                            .value
-
-                        if (fawe.equals("2.12.3-SNAPSHOT")) {
-                            SWException.log("Schematic with Bugged Version Uploaded", """
-                            Schematic=$schemName
-                            User=${user.userName}
-                            Id=${user.id}
-                        """.trimIndent())
-                        }
-                    } catch (_: Exception) {}
-                }
-
-                NodeData.saveFromStream(node, content.inputStream(), version)
-
-                call.respond(ResponseSchematic(node))
-            } catch (e: Exception) {
-                call.respond(HttpStatusCode.BadRequest, ResponseError(
-                    error = e.message ?: "GENERIC", code = "UPLOAD_ERROR"
-                ))
-            }
-        }
-        route("/{id}") {
-            install(SWPermissionCheck) {
-                mustAuth = true
-            }
-
-            get {
-                val node = call.receiveSchem() ?: return@get
-                call.respond(ResponseSchematic(node))
-            }
-
-            post("/download") {
-                val node = call.receiveSchem() ?: return@post
-
-                call.respond(HttpStatusCode.OK, NodeDownload.getLink(node))
-            }
-        }
-    }
-}
-
-suspend fun ApplicationCall.receiveSchem(): SchematicNode? {
-    val schemId = parameters["id"]?.toIntOrNull()
-    if (schemId == null) {
-        respond(HttpStatusCode.BadRequest)
-        return null
-    }
-
-    val schem = SchematicNode.getSchematicNode(schemId)
-    if (schem == null) {
-        respond(HttpStatusCode.NotFound)
-        return null
-    }
-
-    if (!(principal<SWAuthPrincipal>()?.user?.let { schem.accessibleByUser(it) } ?: false)) {
-        respond(HttpStatusCode.Forbidden)
-        return null
-    }
-
-    return schem
-}
@@ -1,60 +0,0 @@
-/*
- *   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.routes.v2
-
-import de.steamwar.ResponseError
-import de.steamwar.routes.ResponseUser
-import de.steamwar.sql.SteamwarUser
-import de.steamwar.sql.UserPerm
-import de.steamwar.util.fetchData
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import io.ktor.server.routing.route
-import java.net.InetSocketAddress
-
-fun Route.configureSteamWarRoute() {
-    route("/steamwar") {
-        get {
-            try {
-                val server = fetchData(InetSocketAddress("steamwar.de", 25565), 100)
-                call.respond(server)
-            } catch (e: Exception) {
-                e.printStackTrace()
-                call.respond(HttpStatusCode.InternalServerError, ResponseError(e.message ?: "Unknown error"))
-                return@get
-            }
-        }
-
-        get("/team") {
-            call.respond(
-                listOf(
-                    UserPerm.PREFIX_ADMIN,
-                    UserPerm.PREFIX_DEVELOPER,
-                    UserPerm.PREFIX_MODERATOR,
-                    UserPerm.PREFIX_SUPPORTER,
-                    UserPerm.PREFIX_BUILDER
-                ).associateWith { SteamwarUser.getUsersWithPerm(it) }.mapKeys { UserPerm.prefixes[it.key]!!.chatPrefix }
-                    .mapValues { it.value.map { ResponseUser(it) } })
-        }
-    }
-}
@@ -1,87 +0,0 @@
-/*
- *   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.routes.v2
-
-import de.steamwar.routes.ResponseEvent
-import de.steamwar.routes.ResponseTeam
-import de.steamwar.routes.ResponseUser
-import de.steamwar.sql.SteamwarUser
-import de.steamwar.sql.Team
-import de.steamwar.sql.TeamTable
-import de.steamwar.sql.TeamTeilnahme
-import de.steamwar.sql.internal.useDb
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-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.like
-import org.jetbrains.exposed.v1.jdbc.Query
-import org.jetbrains.exposed.v1.jdbc.andWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
-
-fun Query.addTeamFilter(teamName: String?, teamKuerzel: String?): Query {
-    teamName?.let { andWhere { TeamTable.name like "%$it%" } }
-    teamKuerzel?.let { andWhere { TeamTable.kuerzel like "%$it%" } }
-    return this
-}
-
-fun Route.configureTeamRoutes() {
-    route("/teams") {
-        get {
-            val teamName = call.request.queryParameters["name"]
-            val teamKuerzel = call.request.queryParameters["kuerzel"]
-
-            val limit = call.request.queryParameters["limit"]?.toIntOrNull() ?: 100
-            val page = call.request.queryParameters["page"]?.toIntOrNull() ?: 0
-
-            call.respond(useDb {
-                TeamTable.selectAll().addTeamFilter(teamName, teamKuerzel).limit(limit).offset((page * limit).toLong())
-                    .map { ResponseTeam(it) }
-            })
-        }
-
-        get("/{team}") {
-            @Serializable
-            data class TeamResponse(
-                val team: ResponseTeam,
-                val members: List<ResponseUser>,
-                val leaders: List<ResponseUser>,
-                val events: List<ResponseEvent>
-            )
-
-            val team = call.parameters["team"]?.toIntOrNull()?.let { Team.byId(it) }
-            if (team == null) {
-                call.respond(HttpStatusCode.NotFound)
-                return@get
-            }
-
-            call.respond(useDb {
-                TeamResponse(
-                    ResponseTeam(team),
-                    team.membersUser.map { ResponseUser(it) },
-                    team.membersUser.filter { it.leader }.map { ResponseUser(it) },
-                    TeamTeilnahme.getEvents(team.teamId).map { ResponseEvent(it) })
-            })
-        }
-    }
-}
@@ -1,274 +0,0 @@
-/*
- *   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.routes.v2
-
-import de.steamwar.ResponseError
-import de.steamwar.data.getCachedSkin
-import de.steamwar.plugins.SWAuthPrincipal
-import de.steamwar.plugins.SWPermissionCheck
-import de.steamwar.routes.ResponseTeam
-import de.steamwar.routes.ResponseUser
-import de.steamwar.routes.ResponseUserList
-import de.steamwar.routes.UserStats
-import de.steamwar.routes.addUserFilter
-import de.steamwar.routes.catchException
-import de.steamwar.sql.Punishment
-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 io.ktor.http.HttpStatusCode
-import io.ktor.server.application.ApplicationCall
-import io.ktor.server.application.call
-import io.ktor.server.application.install
-import io.ktor.server.auth.principal
-import io.ktor.server.request.receive
-import io.ktor.server.response.header
-import io.ktor.server.response.respond
-import io.ktor.server.response.respondFile
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.delete
-import io.ktor.server.routing.get
-import io.ktor.server.routing.post
-import io.ktor.server.routing.put
-import io.ktor.server.routing.route
-import kotlinx.serialization.Serializable
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import java.sql.Timestamp
-import java.time.Instant
-import java.util.UUID
-
-@Serializable
-data class ResponsePunishment(
-    val id: Int,
-    val type: Punishment.PunishmentType,
-    val reason: String,
-    val issuer: ResponseUser,
-    val startTime: Long,
-    val endTime: Long,
-    val perma: Boolean,
-    val active: Boolean
-) {
-    constructor(punishment: Punishment) : this(
-        punishment.id.value,
-        punishment.type,
-        punishment.reason,
-        ResponseUser(SteamwarUser.byId(punishment.punisher)!!),
-        punishment.startTime.toInstant().toEpochMilli(),
-        punishment.endTime.toInstant().toEpochMilli(),
-        punishment.perma,
-        punishment.isCurrent()
-    )
-}
-
-@Serializable
-data class CreatePunishment(
-    val type: Punishment.PunishmentType,
-    val reason: String,
-    val perma: Boolean,
-    val endTime: Long
-)
-
-fun Route.configureUsersRouteV2() {
-    get("/users/{user}/skin") {
-        val user = call.receiveUser()
-        if (user == null) {
-            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-            return@get
-        }
-
-        val skin = getCachedSkin(user.uuid.toString())
-        call.response.header("X-Cache", if (skin.second) "HIT" else "MISS")
-        call.response.header("Cache-Control", "public, max-age=604800")
-        call.respondFile(skin.first)
-    }
-    get("/users/{user}/stats") {
-        val user = call.receiveUser()
-        if (user == null) {
-            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-            return@get
-        }
-
-        val authUser = call.principal<SWAuthPrincipal>()
-
-        if (authUser == null || !(authUser.user.id == user.id || authUser.user.hasPerm(UserPerm.MODERATION))) {
-            call.respond(HttpStatusCode.Forbidden)
-            return@get
-        }
-
-        call.respond(UserStats(user))
-    }
-    route("/users") {
-        install(SWPermissionCheck) {
-            permission = UserPerm.MODERATION
-        }
-        get {
-            val name = call.request.queryParameters["name"]
-            val uuid = call.request.queryParameters["uuid"]?.let { catchException { UUID.fromString(it) } }
-            val team = call.request.queryParameters.getAll("team")?.map { it.toInt() }?.toSet()
-
-            val limit = call.request.queryParameters["limit"]?.toIntOrNull() ?: 100
-            val page = call.request.queryParameters["page"]?.toIntOrNull() ?: 0
-
-            val includePerms = call.request.queryParameters["includePerms"]?.toBoolean() ?: false
-            val includeId = call.request.queryParameters["includeId"]?.toBoolean() ?: false
-
-            call.respond(
-                useDb {
-                    ResponseUserList(
-                        SteamwarUserTable.selectAll().addUserFilter(name, uuid, team).limit(limit)
-                            .offset((page * limit).toLong())
-                            .map { ResponseUser(it, includeId, includePerms) },
-                        SteamwarUserTable.selectAll().addUserFilter(name, uuid, team).count()
-                    )
-                }
-            )
-        }
-
-        route("/{user}") {
-            get {
-                @Serializable
-                data class UserResponse(val user: ResponseUser, val team: ResponseTeam)
-
-                val user = call.receiveUser()
-                if (user == null) {
-                    call.respond(HttpStatusCode.NotFound)
-                    return@get
-                }
-
-                call.respond(
-                    useDb {
-                        UserResponse(ResponseUser(user), ResponseTeam(Team.byId(user.team)))
-                    }
-                )
-            }
-
-            put("/prefix/{prefix}") {
-                val user = call.receiveUser()
-                if (user == null) {
-                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-                    return@put
-                }
-
-                val prefix = call.parameters["prefix"]?.let { name -> UserPerm.entries.find { it.name == name } }
-                if (prefix == null) {
-                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid prefix"))
-                    return@put
-                }
-
-                user.perms().filter { it.name.startsWith("PREFIX_") }.forEach {
-                    UserPerm.removePerm(user, it)
-                }
-
-                if (prefix != UserPerm.PREFIX_NONE) {
-                    UserPerm.addPerm(user, prefix)
-                }
-                call.respond(HttpStatusCode.Accepted)
-            }
-
-            route("/perms") {
-                get {
-                    val user = call.receiveUser()
-                    if (user == null) {
-                        call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-                        return@get
-                    }
-
-                    call.respond(user.perms())
-                }
-                route("/{perm}") {
-                    put {
-                        val user = call.receiveUser()
-                        if (user == null) {
-                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-                            return@put
-                        }
-
-                        val perm = call.parameters["perm"]?.let { name -> UserPerm.entries.find { it.name == name } }
-                        if (perm == null) {
-                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid perm"))
-                            return@put
-                        }
-
-                        UserPerm.addPerm(user, perm)
-                        call.respond(HttpStatusCode.Accepted)
-                    }
-                    delete {
-                        val user = call.receiveUser()
-                        if (user == null) {
-                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-                            return@delete
-                        }
-
-                        val perm = call.parameters["perm"]?.let { name -> UserPerm.entries.find { it.name == name } }
-                        if (perm == null) {
-                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid perm"))
-                            return@delete
-                        }
-
-                        UserPerm.removePerm(user, perm)
-                        call.respond(HttpStatusCode.Accepted)
-                    }
-                }
-            }
-        }
-
-        route("/punishments") {
-            get {
-                val user = call.receiveUser()
-                if (user == null) {
-                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-                    return@get
-                }
-
-                val punishments = user.punishments.toList()
-
-                call.respond(punishments.map { ResponsePunishment(it.second) })
-            }
-            post {
-                val user = call.receiveUser()
-                if (user == null) {
-                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
-                    return@post
-                }
-
-                val punishment = call.receive<CreatePunishment>()
-                val punisher = call.principal<SWAuthPrincipal>()?.user ?: return@post
-
-                user.punish(punishment.type, Timestamp.from(Instant.ofEpochMilli(punishment.endTime)), punishment.reason, punisher.getId(), punishment.perma)
-
-                call.respond(HttpStatusCode.Accepted)
-            }
-        }
-    }
-}
-
-fun ApplicationCall.receiveUser(): SteamwarUser? {
-    val userString = parameters["user"] ?: return null
-
-    if (userString == "me") {
-        return principal<SWAuthPrincipal>()?.user
-    }
-
-    userString.toIntOrNull()?.let { return SteamwarUser.byId(it) }
-    userString.let { catchException { UUID.fromString(it) } }?.let { return SteamwarUser.get(it) }
-    return null
-}
@@ -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"
 )

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