Fix

Signed-off-by: Chaoscaot <max@maxsp.de>

.gitea/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,60 +0,0 @@
-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.

.gitea/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: true

.gitea/ISSUE_TEMPLATE/feature-request.yaml

@@ -1,17 +0,0 @@
-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.

.gitea/workflows/backport-commoncore.yml

@@ -1,193 +0,0 @@
-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

.gitea/workflows/build.yml

@@ -1,145 +0,0 @@
-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"

.gitea/workflows/pull-request-build.yml

@@ -1,76 +0,0 @@
-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"

.gitignore

@@ -21,4 +21,4 @@ lib
 /WebsiteBackend/logs
 /WebsiteBackend/skins
 /WebsiteBackend/config.json
-/WebsiteBackend/sessions
+/WebsiteBackend/sessions

CLI/build.gradle.kts

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

CLI/src/Main.kt

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

CLI/src/commands/SteamWar.kt

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

CLI/src/commands/database/DatabaseCommand.kt

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

CLI/src/commands/database/InfoCommand.kt

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

CLI/src/commands/database/ResetCommand.kt

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

CLI/src/commands/dev/DevCommand.kt

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

CLI/src/commands/profiler/ProfilerCommand.kt

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

CLI/src/commands/user/UserCommand.kt

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

CLI/src/commands/user/UserInfoCommand.kt

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

CLI/src/commands/user/UserSearchCommand.kt

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

CLI/src/db/Database.kt

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

CLI/src/logback.xml

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

CommonCore/SQL/src/de/steamwar/ImplementationProvider.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *   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
@@ -146,12 +146,12 @@ public final class GameModeConfig<M, W> {
     public final List<String> CheckQuestions;
 
     /**
-     * The allowed checkers to check this schematic type denoted by a list of SteamwarUser ids.
+     * The allowed checkers to check this schematic type denoted by a list of SteamWar ids.
      * The people need the {@link UserPerm#CHECK} to be able to check though.
      *
      * @implSpec {@code []} by default -> denoting every person with {@link UserPerm#CHECK} can check it
      */
-    public final Set<Integer> Checkers;
+    public final List<Integer> Checkers;
 
     /**
      * Bundle for countdowns during the fight
@@ -246,7 +246,7 @@ public final class GameModeConfig<M, W> {
         }
 
         CheckQuestions = loader.getStringList("CheckQuestions");
-        Checkers = loader.getIntSet("Checkers");
+        Checkers = loader.getIntList("Checkers");
         Times = new TimesConfig(loader.with("Times"));
         // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
         Schematic = new SchematicConfig<>(loader.with("Schematic"));

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -139,12 +139,6 @@ final class YMLWrapper<M, W> {
         return get(path, o -> (List<Integer>) o);
     }
 
-    public Set<Integer> getIntSet(String path) {
-        List<Integer> list = get(path, o -> (List<Integer>) o);
-        if (list.isEmpty()) return Collections.emptySet();
-        return Collections.unmodifiableSet(new HashSet<>(list));
-    }
-
     public List<SchematicType> getSchematicTypeList(String path) {
         List<String> list = getStringList(path);
         if (list.isEmpty()) {

SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java

@@ -93,7 +93,7 @@ public class ChunkHider18 implements ChunkHider {
     private static final Reflection.Method getKey = Reflection.getTypedMethod(IRegistry.class, null, MinecraftKey.class, Object.class);
     private static final Reflection.Method getName = Reflection.getTypedMethod(MinecraftKey.class, null, String.class);
     protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
-        return !hiddenBlockEntities.contains((String) getName.invoke(getKey.invoke(tileEntityTypes, entityType.get(tile))));
+        return !hiddenBlockEntities.contains(TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(tileEntityTypes, entityType.get(tile)))));
     }
 
     private void blocks(SectionHider section) {

SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java

@@ -20,8 +20,11 @@
 package de.steamwar.techhider;
 
 import de.steamwar.Reflection;
+import de.steamwar.core.Core;
+import net.minecraft.core.IRegistry;
 import net.minecraft.core.SectionPosition;
 import net.minecraft.network.protocol.game.PacketPlayOutBlockBreak;
+import net.minecraft.resources.MinecraftKey;
 import net.minecraft.world.level.block.entity.TileEntitySign;
 import net.minecraft.world.level.block.entity.TileEntityTypes;
 import net.minecraft.world.level.block.state.IBlockData;
@@ -88,6 +91,14 @@ public class ProtocolWrapper18 implements ProtocolWrapper {
         return tileEntityType.get(packet) != signType;
     }
 
+    private static final IRegistry<?> tileEntityTypes = Reflection.getField(Core.getVersion() > 18 ? Reflection.getClass("net.minecraft.core.registries.BuiltInRegistries") : IRegistry.class, IRegistry.class, 0, TileEntityTypes.class).get(null);
+    private static final Reflection.Method getKey = Reflection.getTypedMethod(IRegistry.class, null, MinecraftKey.class, Object.class);
+    private static final Reflection.Method getName = Reflection.getTypedMethod(MinecraftKey.class, null, String.class);
+    @Override
+    public String tileEntityDataType(Object packet) {
+        return TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(tileEntityTypes, tileEntityType.get(packet))));
+    }
+
     @Override
     public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider) {
         return (p, packet) -> {

SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.techhider;
 
+import de.steamwar.Reflection;
 import org.bukkit.entity.Player;
 
 import java.util.function.BiFunction;
@@ -27,6 +28,7 @@ public class ProtocolWrapper19 extends ProtocolWrapper18 {
 
     @Override
     public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider) {
-        return null;
+        Reflection.Field<?> blockBreakPosition = Reflection.getField(blockBreakPacket, TechHider.blockPosition, 0);
+        return (p, packet) -> techHider.getLocationEvaluator().checkBlockPos(p, blockBreakPosition.get(packet)) == TechHider.State.SKIP ? packet : null;
     }
 }

SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java

@@ -25,16 +25,20 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
 import net.minecraft.util.SimpleBitStorage;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import org.bukkit.entity.Player;
 
 import java.util.List;
 import java.util.Set;
+import java.util.function.IntUnaryOperator;
 import java.util.function.BiFunction;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 public class ChunkHider21 implements ChunkHider {
+    private static final int DIRECT_BLOCK_BITS = Math.max(9, Integer.SIZE - Integer.numberOfLeadingZeros(Block.BLOCK_STATE_REGISTRY.size() - 1));
+
     @Override
     public Class<?> mapChunkPacket() {
         return ClientboundLevelChunkWithLightPacket.class;
@@ -96,33 +100,70 @@ public class ChunkHider21 implements ChunkHider {
     private static final Reflection.Method getKey = Reflection.getTypedMethod(registry, "getKey", resourceLocation, Object.class);
     private static final Reflection.Method getName = Reflection.getTypedMethod(resourceLocation, "getPath", String.class);
     protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
-        return !hiddenBlockEntities.contains(getName.invoke(getKey.invoke(nameField.get(null), entityType.get(tile))));
+        return !hiddenBlockEntities.contains(TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(nameField.get(null), entityType.get(tile)))));
     }
 
     private void blocks(SectionHider section) {
-        section.copyBitsPerBlock();
+        int sourceBitsPerBlock = section.readBitsPerBlock();
 
-        boolean singleValued = section.getBitsPerBlock() == 0;
+        if(section.isSkipSection()) {
+            section.writeBitsPerBlock(sourceBitsPerBlock);
+            copyBlockStorage(section);
+            return;
+        }
+
+        boolean singleValued = sourceBitsPerBlock == 0;
         if (singleValued) {
             int value = ProtocolUtils.readVarInt(section.getIn());
-            ProtocolUtils.writeVarInt(section.getOut(), !section.isSkipSection() && section.getObfuscate().contains(value) ? section.getTarget() : value);
+            if(section.blockPrecise()) {
+                writeDirectBlocks(section, DIRECT_BLOCK_BITS, ignored -> value);
+            } else {
+                section.writeBitsPerBlock(sourceBitsPerBlock);
+                ProtocolUtils.writeVarInt(section.getOut(), section.getObfuscate().contains(value) ? section.getTarget() : value);
+            }
             return;
-        } else if (section.getBitsPerBlock() < 9) {
+        } else if (sourceBitsPerBlock < 9) {
+            if(section.blockPrecise()) {
+                int[] palette = section.readPalette();
+                SimpleBitStorage values = new SimpleBitStorage(sourceBitsPerBlock, 4096, section.readNewDataArray(4096));
+                writeDirectBlocks(section, DIRECT_BLOCK_BITS, pos -> palette[values.get(pos)]);
+                return;
+            }
+
+            section.writeBitsPerBlock(sourceBitsPerBlock);
             // Indirect (paletted) storage – only present when bitsPerBlock < 9 in 1.21+
             section.processPalette();
         }
 
-        if (section.isSkipSection() || (!section.blockPrecise() && section.isPaletted())) {
+        if (!section.blockPrecise() && section.isPaletted()) {
             section.skipNewDataArray(4096);
             return;
         }
 
-        SimpleBitStorage values = new SimpleBitStorage(section.getBitsPerBlock(), 4096, section.readNewDataArray(4096));
+        SimpleBitStorage values = new SimpleBitStorage(sourceBitsPerBlock, 4096, section.readNewDataArray(4096));
+        writeDirectBlocks(section, sourceBitsPerBlock, values::get);
+    }
+
+    private void copyBlockStorage(SectionHider section) {
+        if(section.getBitsPerBlock() == 0) {
+            section.copyVarInt();
+        } else {
+            if(section.getBitsPerBlock() < 9)
+                section.skipPalette();
+
+            section.skipNewDataArray(4096);
+        }
+    }
+
+    private void writeDirectBlocks(SectionHider section, int bitsPerBlock, IntUnaryOperator source) {
+        section.writeBitsPerBlock(bitsPerBlock);
+        SimpleBitStorage values = new SimpleBitStorage(bitsPerBlock, 4096);
 
         for (int y = 0; y < 16; y++) {
             for (int z = 0; z < 16; z++) {
                 for (int x = 0; x < 16; x++) {
                     int pos = (((y * 16) + z) * 16) + x;
+                    int value = source.applyAsInt(pos);
 
                     TechHider.State test = section.test(x, y, z);
 
@@ -130,15 +171,17 @@ public class ChunkHider21 implements ChunkHider {
                         case SKIP:
                             break;
                         case CHECK:
-                            if (!section.getObfuscate().contains(values.get(pos)))
+                            if (!section.getObfuscate().contains(value))
                                 break;
                         case HIDE:
-                            values.set(pos, section.getTarget());
+                            value = section.getTarget();
                             break;
                         case HIDE_AIR:
                         default:
-                            values.set(pos, section.getAir());
+                            value = section.getAir();
                     }
+
+                    values.set(pos, value);
                 }
             }
         }

SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ProtocolWrapper21.java

@@ -0,0 +1,104 @@
+/*
+ *   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.techhider;
+
+import de.steamwar.Reflection;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.SectionPos;
+import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.function.BiFunction;
+
+public class ProtocolWrapper21 implements ProtocolWrapper {
+
+    private static final Reflection.Field<SectionPos> multiBlockChangeChunk = Reflection.getField(TechHider.multiBlockChangePacket, SectionPos.class, 0);
+    private static final Reflection.Field<short[]> multiBlockChangePos = Reflection.getField(TechHider.multiBlockChangePacket, short[].class, 0);
+    private static final Reflection.Field<BlockState[]> multiBlockChangeBlocks = Reflection.getField(TechHider.multiBlockChangePacket, BlockState[].class, 0);
+
+    @Override
+    public BiFunction<Player, Object, Object> multiBlockChangeGenerator(TechHider techHider) {
+        return (p, packet) -> {
+            TechHider.LocationEvaluator locationEvaluator = techHider.getLocationEvaluator();
+            SectionPos sectionPos = multiBlockChangeChunk.get(packet);
+            int chunkX = sectionPos.x();
+            int chunkY = sectionPos.y();
+            int chunkZ = sectionPos.z();
+            if(locationEvaluator.skipChunkSection(p, chunkX, chunkY, chunkZ))
+                return packet;
+
+            packet = TechHider.multiBlockChangeCloner.apply(packet);
+            final short[] oldPos = multiBlockChangePos.get(packet);
+            final BlockState[] oldBlocks = multiBlockChangeBlocks.get(packet);
+            ArrayList<Short> poss = new ArrayList<>(oldPos.length);
+            ArrayList<BlockState> blocks = new ArrayList<>(oldPos.length);
+            for(int i = 0; i < oldPos.length; i++) {
+                short pos = oldPos[i];
+                BlockState block = oldBlocks[i];
+                switch(locationEvaluator.check(p, 16*chunkX + SectionPos.sectionRelativeX(pos), 16*chunkY + SectionPos.sectionRelativeY(pos), 16*chunkZ + SectionPos.sectionRelativeZ(pos))) {
+                    case SKIP:
+                        poss.add(pos);
+                        blocks.add(block);
+                        break;
+                    case CHECK:
+                        poss.add(pos);
+                        blocks.add(techHider.iBlockDataHidden(block) ? (BlockState) techHider.getObfuscationTarget() : block);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            if(blocks.isEmpty())
+                return null;
+
+            short[] newPos = new short[poss.size()];
+            for(int i = 0; i < newPos.length; i++)
+                newPos[i] = poss.get(i);
+
+            multiBlockChangePos.set(packet, newPos);
+            multiBlockChangeBlocks.set(packet, blocks.toArray(new BlockState[0]));
+            return packet;
+        };
+    }
+
+    private static final Reflection.Field<BlockEntityType> tileEntityType = Reflection.getField(TechHider.tileEntityDataPacket, BlockEntityType.class, 0);
+
+    @Override
+    public boolean unfilteredTileEntityDataAction(Object packet) {
+        BlockEntityType type = tileEntityType.get(packet);
+        return type != BlockEntityType.SIGN && type != BlockEntityType.HANGING_SIGN;
+    }
+
+    @Override
+    public String tileEntityDataType(Object packet) {
+        return BlockEntityType.getKey(tileEntityType.get(packet)).getPath();
+    }
+
+    private static final Reflection.Field<BlockPos> blockBreakPosition = Reflection.getField(ClientboundBlockDestructionPacket.class, BlockPos.class, 0);
+
+    @Override
+    public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider) {
+        return (p, packet) -> techHider.getLocationEvaluator().checkBlockPos(p, blockBreakPosition.get(packet)) == TechHider.State.SKIP ? packet : null;
+    }
+}

SpigotCore/SpigotCore_9/src/de/steamwar/techhider/ChunkHider9.java

@@ -54,7 +54,7 @@ public class ChunkHider9 extends ChunkHider8 {
             packet = mapChunkCloner.apply(packet);
             Set<String> hiddenBlockEntities = techHider.getHiddenBlockEntities();
             mapChunkBlockEntities.set(packet, ((List<?>)mapChunkBlockEntities.get(packet)).stream().filter(
-                    nbttag -> !hiddenBlockEntities.contains((String) nbtTagGetString.invoke(nbttag, "id"))
+                    nbttag -> !hiddenBlockEntities.contains(TechHider.normalizeBlockEntityId((String) nbtTagGetString.invoke(nbttag, "id")))
             ).collect(Collectors.toList()));
 
             int primaryBitMask = mapChunkBitMask.get(packet);

SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java

@@ -23,6 +23,7 @@ import de.steamwar.Reflection;
 import de.steamwar.Reflection.Field;
 import de.steamwar.core.Core;
 import io.netty.channel.*;
+import io.netty.util.ReferenceCountUtil;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -37,6 +38,7 @@ import org.bukkit.plugin.Plugin;
 
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.logging.Level;
 
@@ -57,17 +59,29 @@ public class TinyProtocol implements Listener {
 	public static final Field<List> networkManagers = Reflection.getField(serverConnection, List.class, 0, networkManager);
 
 	private static final String HANDLER_NAME = "tiny-steamwar";
+	private static final Class<?> bundlePacket = getOptionalClass("net.minecraft.network.protocol.BundlePacket");
+	private static final Class<?> clientboundBundlePacket = getOptionalClass("net.minecraft.network.protocol.game.ClientboundBundlePacket");
+	private static final Reflection.Method bundleSubPackets = bundlePacket == null ? null : Reflection.getTypedMethod(bundlePacket, null, Iterable.class);
+	private static final Reflection.Constructor clientboundBundleConstructor = clientboundBundlePacket == null ? null : Reflection.getConstructor(clientboundBundlePacket, Iterable.class);
 	public static final TinyProtocol instance = new TinyProtocol(Core.getInstance());
 
 	public static void init() {
 		//enforce init
 	}
 
+	private static Class<?> getOptionalClass(String className) {
+		try {
+			return Reflection.getClass(className);
+		} catch (IllegalArgumentException ignored) {
+			return null;
+		}
+	}
+
 	private final Plugin plugin;
 	private final List<?> connections;
 	private boolean closed;
 
-	private final Map<Class<?>, List<BiFunction<Player, Object, Object>>> packetFilters = new HashMap<>();
+	private final Map<Class<?>, List<BiFunction<Player, Object, Object>>> packetFilters = new ConcurrentHashMap<>();
 	@Getter
 	private final Map<Player, PacketInterceptor> playerInterceptors = new HashMap<>();
 
@@ -207,31 +221,51 @@ public class TinyProtocol implements Listener {
 
 		@Override
 		public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+			Object originalMsg = msg;
 			try {
 				msg = filterPacket(player, msg);
 			} catch (Exception e) {
 				plugin.getLogger().log(Level.SEVERE, "Error during incoming packet processing", e);
+				msg = null;
 			}
 
 			if (msg != null) {
 				super.channelRead(ctx, msg);
+			} else {
+				ReferenceCountUtil.release(originalMsg);
 			}
 		}
 
 		@Override
 		public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+			Object originalMsg = msg;
 			try {
 				msg = filterPacket(player, msg);
 			} catch (Exception e) {
 				plugin.getLogger().log(Level.SEVERE, "Error during outgoing packet processing", e);
+				msg = null;
 			}
 
 			if (msg != null) {
 				super.write(ctx, msg, promise);
+			} else {
+				ReferenceCountUtil.release(originalMsg);
+				promise.trySuccess();
 			}
 		}
 
 		private Object filterPacket(Player player, Object packet) {
+			packet = filterSinglePacket(player, packet);
+			if(packet == null)
+				return null;
+
+			if(clientboundBundlePacket != null && clientboundBundlePacket.isInstance(packet))
+				return filterBundlePacket(player, packet);
+
+			return packet;
+		}
+
+		private Object filterSinglePacket(Player player, Object packet) {
 			List<BiFunction<Player, Object, Object>> filters = packetFilters.getOrDefault(packet.getClass(), Collections.emptyList());
 
 			for(BiFunction<Player, Object, Object> filter : filters) {
@@ -243,5 +277,33 @@ public class TinyProtocol implements Listener {
 
 			return packet;
 		}
+
+		private Object filterBundlePacket(Player player, Object packet) {
+			if(bundleSubPackets == null || clientboundBundleConstructor == null)
+				throw new IllegalStateException("Cannot filter bundled packet " + packet.getClass().getName());
+
+			ArrayList<Object> filteredPackets = new ArrayList<>();
+			boolean changed = false;
+			for(Object subPacket : (Iterable<?>) bundleSubPackets.invoke(packet)) {
+				Object filteredPacket = filterPacket(player, subPacket);
+				if(filteredPacket == null) {
+					changed = true;
+					continue;
+				}
+
+				if(filteredPacket != subPacket)
+					changed = true;
+
+				filteredPackets.add(filteredPacket);
+			}
+
+			if(!changed)
+				return packet;
+
+			if(filteredPackets.isEmpty())
+				return null;
+
+			return clientboundBundleConstructor.invoke(filteredPackets);
+		}
 	}
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java

@@ -92,7 +92,17 @@ public interface ChunkHider {
         }
 
         public void copyBitsPerBlock() {
-            bitsPerBlock = in.readByte();
+            bitsPerBlock = in.readUnsignedByte();
+            out.writeByte(bitsPerBlock);
+        }
+
+        public int readBitsPerBlock() {
+            bitsPerBlock = in.readUnsignedByte();
+            return bitsPerBlock;
+        }
+
+        public void writeBitsPerBlock(int bitsPerBlock) {
+            this.bitsPerBlock = bitsPerBlock;
             out.writeByte(bitsPerBlock);
         }
 
@@ -108,6 +118,15 @@ public interface ChunkHider {
                 copyVarInt();
         }
 
+        public int[] readPalette() {
+            int paletteLength = ProtocolUtils.readVarInt(in);
+            int[] palette = new int[paletteLength];
+            for(int i = 0; i < paletteLength; i++)
+                palette[i] = ProtocolUtils.readVarInt(in);
+
+            return palette;
+        }
+
         public void processPalette() {
             if(skipSection) {
                 skipPalette();

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java

@@ -98,10 +98,7 @@ public class ProtocolUtils {
     }
 
     public static int posToChunk(int c){
-        int chunk = c / 16;
-        if(c < 0)
-            chunk--;
-        return chunk;
+        return Math.floorDiv(c, 16);
     }
 
     @Deprecated

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java

@@ -31,6 +31,10 @@ public interface ProtocolWrapper {
 
     boolean unfilteredTileEntityDataAction(Object packet);
 
+    default String tileEntityDataType(Object packet) {
+        return null;
+    }
+
     BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider);
 
     BiFunction<Player, Object, Object> multiBlockChangeGenerator(TechHider techHider);

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java

@@ -27,6 +27,7 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiFunction;
@@ -67,11 +68,12 @@ public class TechHider {
     private final Set<Integer> obfuscateIds;
     @Getter
     private final Set<String> hiddenBlockEntities;
+    private boolean enabled;
 
     public TechHider(LocationEvaluator locationEvaluator, Material obfuscationTarget, Set<Material> obfuscate, Set<String> hiddenBlockEntities) {
         this.locationEvaluator = locationEvaluator;
         this.obfuscateIds = obfuscate.stream().flatMap(m -> BlockIds.impl.materialToAllIds(m).stream()).collect(Collectors.toSet());
-        this.hiddenBlockEntities = hiddenBlockEntities;
+        this.hiddenBlockEntities = hiddenBlockEntities.stream().map(TechHider::normalizeBlockEntityId).collect(Collectors.toSet());
         this.obfuscationTarget = getBlockDataByBlock.invoke(getBlockByMaterial.invoke(null, obfuscationTarget));
         this.obfuscationTargetId = BlockIds.impl.materialToId(obfuscationTarget);
 
@@ -81,9 +83,11 @@ public class TechHider {
         techhiders.put(multiBlockChangePacket, ProtocolWrapper.impl.multiBlockChangeGenerator(this));
         techhiders.put(ChunkHider.impl.mapChunkPacket(), ChunkHider.impl.chunkHiderGenerator(this));
 
-        if(Core.getVersion() > 12 && Core.getVersion() < 19) {
+        if(Core.getVersion() > 12 && Core.getVersion() < 19 || Core.getVersion() >= 21) {
             Class<?> blockBreakClass = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket");
-            techhiders.put(blockBreakClass, ProtocolWrapper.impl.blockBreakHiderGenerator(blockBreakClass, this));
+            BiFunction<Player, Object, Object> blockBreakHider = ProtocolWrapper.impl.blockBreakHiderGenerator(blockBreakClass, this);
+            if(blockBreakHider != null)
+                techhiders.put(blockBreakClass, blockBreakHider);
         }
 
         if(Core.getVersion() > 8){
@@ -94,10 +98,18 @@ public class TechHider {
     }
 
     public void enable() {
+        if(enabled)
+            return;
+
+        enabled = true;
         techhiders.forEach(TinyProtocol.instance::addFilter);
     }
 
     public void disable() {
+        if(!enabled)
+            return;
+
+        enabled = false;
         techhiders.forEach(TinyProtocol.instance::removeFilter);
     }
 
@@ -142,6 +154,8 @@ public class TechHider {
             case SKIP:
                 return packet;
             case CHECK:
+                if(isHiddenBlockEntity(ProtocolWrapper.impl.tileEntityDataType(packet)))
+                    return null;
                 if(ProtocolWrapper.impl.unfilteredTileEntityDataAction(packet))
                     return packet;
             default:
@@ -149,6 +163,19 @@ public class TechHider {
         }
     }
 
+    public boolean isHiddenBlockEntity(String id) {
+        return hiddenBlockEntities.contains(normalizeBlockEntityId(id));
+    }
+
+    public static String normalizeBlockEntityId(String id) {
+        if(id == null)
+            return "";
+
+        id = id.toLowerCase(Locale.ROOT);
+        int namespaceSeparator = id.indexOf(':');
+        return namespaceSeparator < 0 ? id : id.substring(namespaceSeparator + 1);
+    }
+
     public enum State {
         SKIP,
         CHECK,

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

@@ -316,18 +316,8 @@ public class CheckCommand extends SWCommand {
                 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
+                // Accept the team folder schematic and set other to Normal
                 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, () -> {

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

@@ -26,7 +26,6 @@ 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;
@@ -105,16 +104,10 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
                 return;
             }
 
-            String avatarUrl = null;
+            String avatarUrl;
             if (user.getDiscordId() != null) {
-                Member member = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId())
-                        .onErrorMap(throwable -> null)
-                        .complete();
-                if (member != null) {
-                    avatarUrl = member.getEffectiveAvatarUrl();
-                }
-            }
-            if (avatarUrl == null) {
+                avatarUrl = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()).complete().getEffectiveAvatarUrl();
+            } else {
                 avatarUrl = DiscordBot.getInstance().getJda().getSelfUser().getAvatarUrl();
             }
 

settings.gradle.kts

@@ -183,8 +183,6 @@ include(
 
 include("CommandFramework")
 
-include("CLI")
-
 include(
     "CommonCore",
     "CommonCore:Data",

steamwarci.yml

@@ -33,6 +33,4 @@ 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"