Merge branch 'main' into RemoveVersionCode

Fix CraftbukkitWrapper for FightSystem
Merge remote-tracking branch 'origin/main'
2026-05-15 16:05:42 +02:00 · 2026-05-15 16:00:50 +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
669 changed files with 11673 additions and 30043 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"
@@ -20,4 +20,5 @@ lib
 /WebsiteBackend/data
 /WebsiteBackend/logs
 /WebsiteBackend/skins
-/WebsiteBackend/config.json
+/WebsiteBackend/config.json
+/WebsiteBackend/sessions
@@ -1,35 +0,0 @@
-/*
- *   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
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore", "default"))
-
-    compileOnly(libs.nms15)
-    compileOnly(libs.worldedit15)
-}
@@ -1,239 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
-import com.sk89q.worldedit.function.mask.Mask;
-import com.sk89q.worldedit.function.mask.Mask2D;
-import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
-import com.sk89q.worldedit.function.operation.Operations;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.transform.AffineTransform;
-import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.world.World;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.bausystem.region.Point;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.Waterlogged;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BiPredicate;
-import java.util.logging.Level;
-
-public class FlatteningWrapper15 implements FlatteningWrapper {
-
-    @Override
-    public boolean isNoBook(ItemStack item) {
-        return item.getType() != Material.WRITABLE_BOOK && item.getType() != Material.WRITTEN_BOOK;
-    }
-
-    private static final Set<Material> unpushable = new HashSet<>(Arrays.asList(Material.BARRIER, Material.BEACON, Material.COMMAND_BLOCK, Material.CHAIN_COMMAND_BLOCK, Material.REPEATING_COMMAND_BLOCK, Material.ENCHANTING_TABLE, Material.END_GATEWAY, Material.END_PORTAL, Material.ENDER_CHEST, Material.GRINDSTONE, Material.JIGSAW, Material.JUKEBOX, Material.NETHER_PORTAL, Material.OBSIDIAN, Material.STRUCTURE_VOID, Material.BARREL, Material.BEEHIVE, Material.BEE_NEST, Material.BLAST_FURNACE, Material.BREWING_STAND, Material.CHEST, Material.DAYLIGHT_DETECTOR, Material.DISPENSER, Material.DROPPER, Material.FURNACE, Material.HOPPER, Material.LECTERN, Material.SMOKER, Material.TRAPPED_CHEST));
-
-    // TODO: FLOWER
-    private static final Set<Material> breaking = new HashSet<>(Arrays.asList(Material.BAMBOO, Material.CACTUS, Material.CAKE, Material.CARVED_PUMPKIN, Material.CHORUS_FLOWER, Material.CHORUS_PLANT, Material.COBWEB, Material.COCOA, Material.DRAGON_EGG, Material.FIRE, Material.FLOWER_POT, Material.JACK_O_LANTERN, Material.LADDER, Material.LAVA, Material.LAVA, Material.LEVER, Material.LILY_PAD, Material.MELON, Material.NETHER_WART, Material.PUMPKIN, Material.COMPARATOR, Material.REDSTONE_WIRE, Material.REPEATER, Material.TORCH, Material.STRUCTURE_VOID, Material.SCAFFOLDING, Material.SEA_PICKLE, Material.SNOW, Material.SUGAR_CANE, Material.TORCH, Material.TRIPWIRE, Material.TRIPWIRE_HOOK, Material.TURTLE_EGG, Material.VINE, Material.WATER, Material.WHEAT));
-
-    @Override
-    public boolean isUnpusheable(Material material) {
-        if (unpushable.contains(material)) {
-            return true;
-        }
-        String name = material.name();
-        return name.contains("BANNER") || name.contains("SIGN");
-    }
-
-    @Override
-    public boolean isBreakingOnPush(Material material) {
-        if (breaking.contains(material)) {
-            return true;
-        }
-        String name = material.name();
-        return name.contains("BED") || name.contains("BUTTON") || name.contains("CARPET") || (name.contains("DOOR") && !name.contains("TRAPDOOR")) || name.contains("HEAD") || name.contains("LEAVES") || name.contains("MUSHROOM") || name.contains("PRESSURE_PLATE") || name.contains("SHULKER_BOX");
-    }
-
-    @Override
-    public boolean isWorldEditCommand(String command) {
-        if (command.startsWith("/")) {
-            command = command.replaceFirst("/", "");
-        }
-        command = command.toLowerCase();
-        return WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().getCommandManager().containsCommand(command);
-    }
-
-    private static final WorldEditPlugin WORLDEDIT_PLUGIN = Objects.requireNonNull((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
-    private static final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
-
-    @Override
-    public void setSelection(Player p, Point minPoint, Point maxPoint) {
-        WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, minPoint.toBlockVector3(), maxPoint.toBlockVector3()));
-    }
-
-    @Override
-    public Clipboard loadSchematic(File file) {
-        Clipboard clipboard;
-        try (ClipboardReader reader = Objects.requireNonNull(ClipboardFormats.findByFile(file)).getReader(new FileInputStream(file))) {
-            clipboard = reader.read();
-        } catch (NullPointerException | IOException e) {
-            throw new SecurityException("Bausystem schematic not found", e);
-        }
-        return clipboard;
-    }
-
-    @Override
-    public EditSession paste(PasteBuilder pasteBuilder) {
-        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
-            Clipboard clipboard = pasteBuilder.getClipboard();
-
-            if (!pasteBuilder.getMappers().isEmpty()) {
-                BlockVector3 minimum = clipboard.getRegion().getMinimumPoint();
-                for (int x = 0; x < clipboard.getDimensions().getX(); x++) {
-                    for (int y = 0; y < clipboard.getDimensions().getY(); y++) {
-                        for (int z = 0; z < clipboard.getDimensions().getZ(); z++) {
-                            BlockVector3 pos = minimum.add(x, y, z);
-                            pasteBuilder.getMappers().forEach(mapper -> mapper.accept(clipboard, pos));
-                        }
-                    }
-                }
-            }
-
-            AtomicReference<BlockVector3> pastePoint = new AtomicReference<>();
-            if (!pasteBuilder.getPredicates().isEmpty()) {
-                e.setMask(new Mask() {
-                    @Override
-                    public boolean test(BlockVector3 blockVector3) {
-                        BaseBlock block = clipboard.getFullBlock(blockVector3.subtract(pastePoint.get()).add(clipboard.getRegion().getMinimumPoint()));
-                        String blockName = block.getBlockType().toString().toLowerCase();
-                        for (BiPredicate<BaseBlock, String> predicate : pasteBuilder.getPredicates()) {
-                            if (!predicate.test(block, blockName)) return false;
-                        }
-                        return true;
-                    }
-
-                    public Mask copy() {
-                        return this;
-                    }
-
-                    @Nullable
-                    @Override
-                    public Mask2D toMask2D() {
-                        return null;
-                    }
-                });
-            }
-
-            ClipboardHolder ch = new ClipboardHolder(clipboard);
-            BlockVector3 dimensions = clipboard.getDimensions();
-            BlockVector3 v = BlockVector3.at(pasteBuilder.getPastPoint().getX(), pasteBuilder.getPastPoint().getY(), pasteBuilder.getPastPoint().getZ());
-            BlockVector3 offset = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin());
-            if (pasteBuilder.isRotate()) {
-                ch.setTransform(new AffineTransform().rotateY(180));
-                v = v.add(dimensions.getX() / 2, 0, dimensions.getZ() / 2).subtract(offset.multiply(-1, 1, -1)).subtract(0, 0, 1);
-            } else {
-                v = v.subtract(dimensions.getX() / 2, 0, dimensions.getZ() / 2).subtract(offset);
-            }
-            pastePoint.set(v);
-
-            if (pasteBuilder.isReset()) {
-                e.setBlocks(new CuboidRegion(pasteBuilder.getMinPoint().toBlockVector3(), pasteBuilder.getMaxPoint().toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
-                if (pasteBuilder.getWaterLevel() != 0) {
-                    e.setBlocks(new CuboidRegion(pasteBuilder.getMinPoint().toBlockVector3(), pasteBuilder.getMaxPoint().toBlockVector3().withY(pasteBuilder.getWaterLevel())), Objects.requireNonNull(BlockTypes.WATER).getDefaultState().toBaseBlock());
-                }
-            }
-            Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(pasteBuilder.isIgnoreAir()).build());
-            return e;
-        } catch (WorldEditException e) {
-            throw new SecurityException(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public Clipboard copy(Point minPoint, Point maxPoint, Point copyPoint) {
-        BukkitWorld bukkitWorld = new BukkitWorld(Bukkit.getWorlds().get(0));
-        CuboidRegion region = new CuboidRegion(bukkitWorld, minPoint.toBlockVector3(), maxPoint.toBlockVector3());
-        BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
-        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(bukkitWorld, -1)) {
-            ForwardExtentCopy copy = new ForwardExtentCopy(
-                    e, region, clipboard, region.getMinimumPoint()
-            );
-
-            copy.setCopyingEntities(false);
-            copy.setCopyingBiomes(false);
-
-            Operations.complete(copy);
-            clipboard.setOrigin(copyPoint.toBlockVector3());
-            return clipboard;
-        } catch (WorldEditException e) {
-            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-            return null;
-        }
-    }
-
-    @Override
-    public boolean backup(Point minPoint, Point maxPoint, File file) {
-        Clipboard clipboard = copy(minPoint, maxPoint, minPoint);
-        try (ClipboardWriter writer = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(file))) {
-            writer.write(clipboard);
-            return true;
-        } catch (IOException e) {
-            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean inWater(org.bukkit.World world, Vector tntPosition) {
-        Block block = world.getBlockAt(tntPosition.getBlockX(), tntPosition.getBlockY(), tntPosition.getBlockZ());
-        if (block.getType() == Material.WATER)
-            return true;
-
-        BlockData data = block.getBlockData();
-        if (!(data instanceof Waterlogged))
-            return false;
-
-        return ((Waterlogged) data).isWaterlogged();
-    }
-}
@@ -1,129 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.server.v1_15_R1.*;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-
-public class NMSWrapper15 implements NMSWrapper {
-
-    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerGameMode.set(((CraftPlayer) player).getHandle().playerInteractManager, EnumGamemode.getById(gameMode.getValue()));
-    }
-
-    @Override
-    public void setSlotToItemStack(Player player, Object o) {
-        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
-        int index = packetPlayInSetCreativeSlot.b();
-        if (index >= 36 && index <= 44) {
-            index -= 36;
-        } else if (index > 44) {
-            index -= 5;
-        } else if (index <= 8) {
-            index = index - 8 + 36;
-        }
-        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.getItemStack()));
-        if (index < 9) player.getInventory().setHeldItemSlot(index);
-        player.updateInventory();
-    }
-
-    private static final Reflection.Field<Integer> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, int.class, 0);
-
-    @Override
-    public void setGameStateChangeReason(Object packet) {
-        gameStateChangeReason.set(packet, 3);
-    }
-
-    @Override
-    public void setPlayerBuildAbilities(Player player) {
-        ((CraftPlayer) player).getHandle().abilities.mayBuild = true;
-        ((CraftPlayer) player).getHandle().abilities.canInstantlyBuild = true;
-    }
-
-    @Override
-    public Material pathMaterial() {
-        return Material.GRASS_PATH;
-    }
-
-    private static final int threshold = 2048;
-
-    @Override
-    public boolean checkItemStack(ItemStack item) {
-        net.minecraft.server.v1_15_R1.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
-        NBTTagCompound tag = nmsItem.getTag();
-        if (tag != null && tag.hasKey("BlockEntityTag")) {
-            NBTTagCompound blockTag = tag.getCompound("BlockEntityTag");
-            if (blockTag.hasKey("Items")) {
-                return drillDown(blockTag.getList("Items", 10), 0, 0) > threshold;
-            }
-        }
-
-        return false;
-    }
-
-    private int drillDown(NBTTagList items, int layer, int start) {
-        if (layer > 2) return start + threshold;
-        int invalid = start;
-        for (NBTBase nbtBase : items) {
-            if (!(nbtBase instanceof NBTTagCompound))
-                continue;
-            NBTTagCompound slot = (NBTTagCompound) nbtBase;
-            if (slot.hasKey("tag")) {
-                invalid += slot.getByte("Count");
-                NBTTagCompound iTag = slot.getCompound("tag");
-                if (iTag.hasKey("BlockEntityTag")) {
-                    NBTTagCompound blockTag = iTag.getCompound("BlockEntityTag");
-                    if (blockTag.hasKey("Items")) {
-                        invalid = drillDown(blockTag.getList("Items", 10), layer + 1, invalid);
-                    }
-                }
-            }
-            if (invalid > threshold)
-                break;
-        }
-        return invalid;
-    }
-
-    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
-
-    @Override
-    public Object resetExplosionKnockback(Object packet) {
-        PacketPlayOutExplosion packetPlayOutExplosion = (PacketPlayOutExplosion) packet;
-        return new PacketPlayOutExplosion(a.get(packetPlayOutExplosion), b.get(packetPlayOutExplosion), c.get(packetPlayOutExplosion), d.get(packetPlayOutExplosion), e.get(packetPlayOutExplosion), Vec3D.a);
-    }
-}
@@ -1,43 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import org.bukkit.Material;
-
-public class PlaceItemWrapper15 implements PlaceItemWrapper {
-
-    public PlaceItemWrapper15() {
-        for (Material material : Material.values()) {
-            if (!material.isBlock()) continue;
-            if (material.isLegacy()) continue;
-
-            String nonWall = material.name().replace("_WALL_", "").replace("WALL_", "").replace("_WALL", "");
-            try {
-                Material nonWallMaterial = Material.valueOf(nonWall);
-                if (nonWallMaterial != material && nonWallMaterial.isItem() && !nonWallMaterial.isBlock()) {
-                    BLOCK_MATERIAL_TO_WALL_BLOCK_MATERIAL.put(nonWallMaterial, material);
-                }
-            } catch (Exception e) {
-                // Ignore
-            }
-        }
-        ITEM_MATERIAL_TO_BLOCK_MATERIAL.put(Material.REDSTONE, Material.REDSTONE_WIRE);
-    }
-}
@@ -1,51 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.PacketPlayInFlying;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class PlayerMovementWrapper15 implements PlayerMovementWrapper {
-
-    @Override
-    public void setPosition(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
-        if (Float.isNaN(packetPlayInFlying.a(Float.NaN))) {
-            entityPlayer.e(packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0));
-        } else {
-            entityPlayer.setLocation(packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0), packetPlayInFlying.a(0F), packetPlayInFlying.b(0F));
-        }
-    }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        Object packet = Reflection.newInstance(teleportPacket);
-        teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0),
-                Float.isNaN(packetPlayInFlying.a(Float.NaN)) ? player.getLocation().getYaw() : packetPlayInFlying.a(0.0F),
-                Float.isNaN(packetPlayInFlying.b(Float.NaN)) ? player.getLocation().getPitch() : packetPlayInFlying.b(0.0F));
-        return packet;
-    }
-}
@@ -1,23 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-public class TickListener15 implements TickListener {
-}
@@ -1,140 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.bossbar.BossBarService;
-import de.steamwar.bausystem.utils.tps.TPSFreezeUtils;
-import de.steamwar.bausystem.utils.tps.TPSLimitUtils;
-import de.steamwar.core.TPSWarpUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class TickManager15 implements TickManager, Listener {
-
-    private static float currentTPSLimit = 20;
-    private boolean currentlyStepping = false;
-    private float currentLimit;
-    private int stepsTotal;
-    private int stepsLeft;
-
-    @Override
-    public boolean canFreeze() {
-        return TPSFreezeUtils.isCanFreeze();
-    }
-
-    @Override
-    public void setTickRate(float tickRate) {
-        if (currentlyStepping) {
-            currentlyStepping = false;
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                BossBarService.instance.remove(player, Region.getGlobalRegion(), "TickStep");
-            });
-        }
-        TPSWarpUtils.warp(tickRate);
-        if (currentTPSLimit == 0 && tickRate != 0) {
-            TPSFreezeUtils.unfreeze();
-        }
-        currentTPSLimit = tickRate;
-        if (tickRate == 0) {
-            TPSLimitUtils.unlimit();
-            TPSFreezeUtils.freeze();
-        } else if (tickRate < 20.0) {
-            TPSLimitUtils.limit(tickRate);
-        } else if (tickRate >= 20) {
-            TPSLimitUtils.unlimit();
-        }
-    }
-
-    @Override
-    public boolean isFrozen() {
-        return TPSFreezeUtils.frozen();
-    }
-
-    @Override
-    public void setFreeze(boolean freeze) {
-        if (freeze) {
-            setTickRate(0);
-        }
-    }
-
-    @Override
-    public void stepTicks(int ticks) {
-        currentLimit = 0;
-        setTickRate(20);
-        stepsLeft = ticks;
-        stepsTotal = ticks;
-        currentlyStepping = true;
-    }
-
-    @Override
-    public void sprintTicks(int ticks) {
-        currentLimit = currentTPSLimit;
-        setTickRate(4000);
-        stepsLeft = ticks;
-        stepsTotal = ticks;
-        currentlyStepping = true;
-    }
-
-    @Override
-    public boolean isSprinting() {
-        return currentlyStepping && currentTPSLimit > 20;
-    }
-
-    @Override
-    public boolean isStepping() {
-        return currentlyStepping && currentTPSLimit <= 20;
-    }
-
-    @Override
-    public float getTickRate() {
-        return currentTPSLimit;
-    }
-
-    @Override
-    public void setBlockTpsPacket(boolean block) {
-
-    }
-
-    @Override
-    public long getTotalTicks() {
-        return stepsTotal;
-    }
-
-    @Override
-    public long getDoneTicks() {
-        return stepsTotal - stepsLeft;
-    }
-
-    @Override
-    public long getRemainingTicks() {
-        return stepsLeft;
-    }
-
-    @EventHandler
-    public void onTickEnd(TickEndEvent event) {
-        if (!currentlyStepping) return;
-        stepsLeft--;
-        if (stepsLeft <= 0) {
-            setTickRate(currentLimit);
-        }
-    }
-}
@@ -1,131 +0,0 @@
-/*
- *   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.bausystem.utils.tps;
-
-import de.steamwar.Reflection;
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.core.BountifulWrapper;
-import de.steamwar.core.ChatWrapper;
-import de.steamwar.core.Core;
-import lombok.experimental.UtilityClass;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@UtilityClass
-class PacketCache {
-
-    private static List<Object> packets = new ArrayList<>();
-    private static Set<Entity> entities = new HashSet<>();
-    private static BukkitTask task = null;
-
-    private static Class<?> vec3dClass = Reflection.getClass("net.minecraft.world.phys.Vec3");
-    private static Reflection.Field<Object> zeroVec3d = (Reflection.Field<Object>) Reflection.getField(vec3dClass, vec3dClass, 0);
-    private static Object ZERO_VEC3D = zeroVec3d.get(null);
-    private static Class<?> velocityPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket");
-    private static Reflection.Constructor velocityPacketConstructor = Reflection.getConstructor(velocityPacketClass, int.class, vec3dClass);
-
-    private static Class<?> teleportPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket");
-    private static Class<?> entityClass = Reflection.getClass("net.minecraft.world.entity.Entity");
-    private static Reflection.Constructor teleportPacketConstructor = Reflection.getConstructor(teleportPacketClass, entityClass);
-
-    private static Class<?> craftEntityClass = Reflection.getClass("org.bukkit.craftbukkit.entity.CraftEntity");
-    private static Reflection.Method getHandle = Reflection.getMethod(craftEntityClass, "getHandle");
-
-    private static Object noGravityDataWatcher = BountifulWrapper.impl.getDataWatcherObject(5, Boolean.class);
-    private static Object fuseDataWatcher = BountifulWrapper.impl.getDataWatcherObject(8, Integer.class);
-
-    public void continuousSendCache() {
-        if (task != null) {
-            return;
-        }
-
-        createPackets();
-        task = new BukkitRunnable() {
-            @Override
-            public void run() {
-                _sendCache();
-            }
-        }.runTaskTimer(Core.getInstance(), 1, 1);
-    }
-
-    public void sendCache() {
-        if (task != null) {
-            task.cancel();
-            task = null;
-        }
-        _sendCache();
-    }
-
-    private void _sendCache() {
-        createPackets();
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            for (Object packet : packets) {
-                TinyProtocol.instance.sendPacket(player, packet);
-            }
-        }
-    }
-
-    public void clearCache() {
-        packets.clear();
-        entities.clear();
-
-        if (task != null) {
-            task.cancel();
-            task = null;
-        }
-    }
-
-    private void createPackets() {
-        if (entities.stream().anyMatch(Entity::isDead)) {
-            entities.clear();
-            packets.clear();
-        }
-        List<Entity> entities = Bukkit.getWorlds().get(0).getEntities().stream()
-                .filter(e -> !(e instanceof Player))
-                .filter(e -> PacketCache.entities.add(e))
-                .collect(Collectors.toList());
-
-        for (Entity entity : entities) {
-            packets.add(teleportPacketConstructor.invoke(getHandle.invoke(entity)));
-        }
-        for (Entity entity : entities) {
-            packets.add(velocityPacketConstructor.invoke(entity.getEntityId(), ZERO_VEC3D));
-        }
-        for (Entity entity : entities) {
-            packets.add(ChatWrapper.impl.getDataWatcherPacket(entity.getEntityId(), noGravityDataWatcher, true));
-        }
-        for (Entity entity : entities) {
-            if (!(entity instanceof TNTPrimed)) continue;
-            TNTPrimed tnt = (TNTPrimed) entity;
-            int fuse = tnt.getFuseTicks();
-            packets.add(ChatWrapper.impl.getDataWatcherPacket(entity.getEntityId(), fuseDataWatcher, fuse - (fuse % 5) + 1));
-        }
-    }
-}
@@ -1,76 +0,0 @@
-/*
- *   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.bausystem.utils.tps;
-
-import de.steamwar.Reflection;
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-
-@UtilityClass
-public class TPSFreezeUtils {
-
-    private static Reflection.Field<Boolean> fieldAccessor;
-    @Getter
-    private static final boolean canFreeze;
-
-    private static final Reflection.Method getWorldHandle = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.CraftWorld"), "getHandle", null);
-
-    @Getter
-    private static boolean frozen = false;
-
-    private static final World world = Bukkit.getWorlds().get(0);
-
-    static {
-        Reflection.Field<Boolean> fieldAccessor;
-        try {
-            fieldAccessor = Reflection.getField(Reflection.getClass("net.minecraft.server.level.ServerLevel"), "freezed", boolean.class);
-        } catch (IllegalArgumentException e) {
-            fieldAccessor = null;
-        }
-        canFreeze = fieldAccessor != null;
-        TPSFreezeUtils.fieldAccessor = fieldAccessor;
-    }
-
-    public void freeze() {
-        setFreeze(world, true);
-    }
-
-    public void unfreeze() {
-        setFreeze(world, false);
-    }
-
-    public boolean frozen() {
-        return canFreeze && frozen;
-    }
-
-    private void setFreeze(World world, boolean state) {
-        if (canFreeze) {
-            fieldAccessor.set(getWorldHandle.invoke(world), state);
-            if (state) {
-                PacketCache.continuousSendCache();
-            } else {
-                PacketCache.clearCache();
-            }
-            frozen = state;
-        }
-    }
-}
@@ -1,124 +0,0 @@
-/*
- *   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.bausystem.utils.tps;
-
-import de.steamwar.Reflection;
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.bausystem.utils.PlayerMovementWrapper;
-import de.steamwar.core.Core;
-import lombok.experimental.UtilityClass;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.function.BiFunction;
-
-@UtilityClass
-public class TPSLimitUtils {
-
-    private static long currentTime = System.nanoTime();
-    private static BukkitTask tpsLimiter = null;
-    private static Queue<Runnable> packetQueue = new ConcurrentLinkedQueue<>();
-
-    public void unlimit() {
-        if (tpsLimiter != null) tpsLimiter.cancel();
-        tpsLimiter = null;
-    }
-
-    public void limit(double tps) {
-        if (tpsLimiter != null) tpsLimiter.cancel();
-
-        double delay = 20 / tps;
-        int loops = (int) Math.ceil(delay);
-        long sleepDelay = (long) (50 * delay) / loops;
-
-        tpsLimiter = Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> {
-            PacketCache.sendCache();
-            for (int i = 0; i < loops; i++) {
-                sleepUntilNextTick(sleepDelay);
-                PacketCache.sendCache();
-                while (true) {
-                    Runnable runnable = packetQueue.poll();
-                    if (runnable == null) break;
-                    runnable.run();
-                }
-            }
-            PacketCache.clearCache();
-        }, 0, 1);
-    }
-
-    private void sleepUntilNextTick(long neededDelta) {
-        long lastTime = currentTime;
-        currentTime = System.nanoTime();
-
-        long timeDelta = (currentTime - lastTime) / 1000000;
-        if (neededDelta - timeDelta < 0) return;
-
-        try {
-            Thread.sleep(neededDelta - timeDelta);
-            currentTime = System.nanoTime();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-    }
-
-    /*
-    static {
-        long timeInterval = 50;
-        final long[] lastTime = {System.currentTimeMillis()};
-        final double[] tps = {20.0};
-        Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> {
-            long currentTime = System.currentTimeMillis();
-            if (currentTime > lastTime[0]) {
-                tps[0] = (double)timeInterval / (double)(currentTime - lastTime[0]) * 20.0;
-            }
-
-            lastTime[0] = currentTime;
-
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                SWUtils.sendToActionbar(player, String.valueOf((int) (tps[0] * 10.0) / 10.0));
-            });
-        }, timeInterval / 50L, timeInterval / 50L);
-    }
-     */
-
-    private static final Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
-    private static final Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
-    static {
-        BiFunction<Player, Object, Object> positionSetter = (player, o) -> {
-            if (tpsLimiter != null) {
-                Object object = PlayerMovementWrapper.impl.convertToOut(player, o);
-                packetQueue.add(() -> {
-                    PlayerMovementWrapper.impl.setPosition(player, o);
-                    Bukkit.getOnlinePlayers().forEach(p -> {
-                        if (p == player) return;
-                        TinyProtocol.instance.sendPacket(p, object);
-                    });
-                });
-                return null;
-            }
-            return o;
-        };
-        TinyProtocol.instance.addFilter(position, positionSetter);
-        TinyProtocol.instance.addFilter(positionLook, positionSetter);
-    }
-}
@@ -1,35 +0,0 @@
-/*
- *   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
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore", "default"))
-
-    compileOnly(libs.spigotapi)
-    compileOnly(libs.nms18)
-}
@@ -1,135 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.protocol.game.*;
-import net.minecraft.server.level.PlayerInteractManager;
-import net.minecraft.world.level.EnumGamemode;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-
-public class NMSWrapper18 implements NMSWrapper {
-
-    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerGameMode.set(((CraftPlayer) player).getHandle().d, EnumGamemode.a(gameMode.getValue()));
-
-    }
-
-    @Override
-    public void setSlotToItemStack(Player player, Object o) {
-        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
-        int index = packetPlayInSetCreativeSlot.b();
-        if (index >= 36 && index <= 44) {
-            index -= 36;
-        } else if (index > 44) {
-            index -= 5;
-        } else if (index <= 8) {
-            index = index - 8 + 36;
-        }
-        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.c()));
-        if (index < 9) player.getInventory().setHeldItemSlot(index);
-        player.updateInventory();
-    }
-
-    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
-
-    @Override
-    public void setGameStateChangeReason(Object packet) {
-        gameStateChangeReason.set(packet, PacketPlayOutGameStateChange.d);
-    }
-
-    @Override
-    public void setPlayerBuildAbilities(Player player) {
-        ((CraftPlayer) player).getHandle().fs().d = true;
-        ((CraftPlayer) player).getHandle().fs().e = true;
-    }
-
-    @Override
-    public Material pathMaterial() {
-        return Material.DIRT_PATH;
-    }
-
-    private static final int threshold = 2048;
-
-    @Override
-    public boolean checkItemStack(ItemStack item) {
-        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
-        NBTTagCompound tag = nmsItem.t();
-        if (tag != null && tag.e("BlockEntityTag")) {
-            NBTTagCompound blockTag = tag.p("BlockEntityTag");
-            if (blockTag.e("Items")) {
-                return drillDown(blockTag.c("Items", 10), 0, 0) > threshold;
-            }
-        }
-
-        return false;
-    }
-
-    private int drillDown(NBTTagList items, int layer, int start) {
-        if (layer > 2) return start + threshold;
-        int invalid = start;
-        for (NBTBase nbtBase : items) {
-            if (!(nbtBase instanceof NBTTagCompound))
-                continue;
-            NBTTagCompound slot = (NBTTagCompound) nbtBase;
-            if (slot.e("tag")) {
-                invalid += slot.f("Count");
-                NBTTagCompound iTag = slot.p("tag");
-                if (iTag.e("BlockEntityTag")) {
-                    NBTTagCompound blockTag = iTag.p("BlockEntityTag");
-                    if (blockTag.e("Items")) {
-                        invalid = drillDown(blockTag.c("Items", 10), layer + 1, invalid);
-                    }
-                }
-            }
-            if (invalid > threshold)
-                break;
-        }
-        return invalid;
-    }
-
-    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
-
-    @Override
-    public Object resetExplosionKnockback(Object packet) {
-        PacketPlayOutExplosion packetPlayOutExplosion = (PacketPlayOutExplosion) packet;
-        return new PacketPlayOutExplosion(a.get(packetPlayOutExplosion), b.get(packetPlayOutExplosion), c.get(packetPlayOutExplosion), d.get(packetPlayOutExplosion), e.get(packetPlayOutExplosion), null);
-    }
-}
@@ -1,51 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import net.minecraft.network.protocol.game.PacketPlayInFlying;
-import net.minecraft.server.level.EntityPlayer;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class PlayerMovementWrapper18 implements PlayerMovementWrapper {
-
-    @Override
-    public void setPosition(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
-        if (packetPlayInFlying.h) {
-            entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
-        } else {
-            entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
-        }
-    }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        Object packet = Reflection.newInstance(teleportPacket);
-        teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c,
-                packetPlayInFlying.h ? player.getLocation().getYaw() : packetPlayInFlying.d,
-                packetPlayInFlying.h ? player.getLocation().getPitch() : packetPlayInFlying.e);
-        return packet;
-    }
-}
@@ -1,37 +0,0 @@
-/*
- *   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
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore", "default"))
-
-    compileOnly(libs.spigotapi)
-    compileOnly(libs.paperapi)
-
-    compileOnly(libs.nms19)
-}
@@ -1,134 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.protocol.game.*;
-import net.minecraft.server.level.PlayerInteractManager;
-import net.minecraft.world.level.EnumGamemode;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-
-public class NMSWrapper19 implements NMSWrapper {
-
-    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerGameMode.set(((CraftPlayer) player).getHandle().d, EnumGamemode.a(gameMode.getValue()));
-    }
-
-    @Override
-    public void setSlotToItemStack(Player player, Object o) {
-        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
-        int index = packetPlayInSetCreativeSlot.b();
-        if (index >= 36 && index <= 44) {
-            index -= 36;
-        } else if (index > 44) {
-            index -= 5;
-        } else if (index <= 8) {
-            index = index - 8 + 36;
-        }
-        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.c()));
-        if (index < 9) player.getInventory().setHeldItemSlot(index);
-        player.updateInventory();
-    }
-
-    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
-
-    @Override
-    public void setGameStateChangeReason(Object packet) {
-        gameStateChangeReason.set(packet, PacketPlayOutGameStateChange.d);
-    }
-
-    @Override
-    public void setPlayerBuildAbilities(Player player) {
-        ((CraftPlayer) player).getHandle().fF().d = true;
-        ((CraftPlayer) player).getHandle().fF().e = true;
-    }
-
-    @Override
-    public Material pathMaterial() {
-        return Material.DIRT_PATH;
-    }
-
-    private static final int threshold = 2048;
-
-    @Override
-    public boolean checkItemStack(ItemStack item) {
-        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
-        NBTTagCompound tag = nmsItem.v();
-        if (tag != null && tag.e("BlockEntityTag")) {
-            NBTTagCompound blockTag = tag.p("BlockEntityTag");
-            if (blockTag.e("Items")) {
-                return drillDown(blockTag.c("Items", 10), 0, 0) > threshold;
-            }
-        }
-
-        return false;
-    }
-
-    private int drillDown(NBTTagList items, int layer, int start) {
-        if (layer > 2) return start + threshold;
-        int invalid = start;
-        for (NBTBase nbtBase : items) {
-            if (!(nbtBase instanceof NBTTagCompound))
-                continue;
-            NBTTagCompound slot = (NBTTagCompound) nbtBase;
-            if (slot.e("tag")) {
-                invalid += slot.f("Count");
-                NBTTagCompound iTag = slot.p("tag");
-                if (iTag.e("BlockEntityTag")) {
-                    NBTTagCompound blockTag = iTag.p("BlockEntityTag");
-                    if (blockTag.e("Items")) {
-                        invalid = drillDown(blockTag.c("Items", 10), layer + 1, invalid);
-                    }
-                }
-            }
-            if (invalid > threshold)
-                break;
-        }
-        return invalid;
-    }
-
-    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
-
-    @Override
-    public Object resetExplosionKnockback(Object packet) {
-        PacketPlayOutExplosion packetPlayOutExplosion = (PacketPlayOutExplosion) packet;
-        return new PacketPlayOutExplosion(a.get(packetPlayOutExplosion), b.get(packetPlayOutExplosion), c.get(packetPlayOutExplosion), d.get(packetPlayOutExplosion), e.get(packetPlayOutExplosion), null);
-    }
-}
@@ -1,51 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import net.minecraft.network.protocol.game.PacketPlayInFlying;
-import net.minecraft.server.level.EntityPlayer;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class PlayerMovementWrapper19 implements PlayerMovementWrapper {
-
-    @Override
-    public void setPosition(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
-        if (packetPlayInFlying.h) {
-            entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
-        } else {
-            entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
-        }
-    }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        Object packet = Reflection.newInstance(teleportPacket);
-        teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c,
-                packetPlayInFlying.h ? player.getLocation().getYaw() : packetPlayInFlying.d,
-                packetPlayInFlying.h ? player.getLocation().getPitch() : packetPlayInFlying.e);
-        return packet;
-    }
-}
@@ -1,50 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import com.destroystokyo.paper.event.server.ServerTickEndEvent;
-import com.destroystokyo.paper.event.server.ServerTickStartEvent;
-import de.steamwar.bausystem.BauSystem;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class TickListener19 implements TickListener, Listener {
-
-    private boolean tickStartRan = false;
-
-    public TickListener19() {
-        Bukkit.getPluginManager().registerEvents(this, BauSystem.getInstance());
-    }
-
-    @EventHandler
-    public void onServerTickStart(ServerTickStartEvent event) {
-        if (TickManager.impl.isFrozen()) return;
-        Bukkit.getPluginManager().callEvent(new TickStartEvent());
-        tickStartRan = true;
-    }
-
-    @EventHandler
-    public void onServerTickEnd(ServerTickEndEvent event) {
-        if (!tickStartRan) return;
-        Bukkit.getPluginManager().callEvent(new TickEndEvent());
-        tickStartRan = false;
-    }
-}
@@ -1,36 +0,0 @@
-/*
- *   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
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore", "default"))
-
-    compileOnly(libs.spigotapi)
-
-    compileOnly(libs.nms20)
-}
@@ -1,136 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.protocol.game.PacketPlayInSetCreativeSlot;
-import net.minecraft.network.protocol.game.PacketPlayOutExplosion;
-import net.minecraft.network.protocol.game.PacketPlayOutGameStateChange;
-import net.minecraft.server.level.PlayerInteractManager;
-import net.minecraft.world.level.EnumGamemode;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-
-public class NMSWrapper20 implements NMSWrapper {
-
-    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerGameMode.set(((CraftPlayer) player).getHandle().e, EnumGamemode.a(gameMode.getValue()));
-    }
-
-    @Override
-    public void setSlotToItemStack(Player player, Object o) {
-        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
-        int index = packetPlayInSetCreativeSlot.a();
-        if (index >= 36 && index <= 44) {
-            index -= 36;
-        } else if (index > 44) {
-            index -= 5;
-        } else if (index <= 8) {
-            index = index - 8 + 36;
-        }
-        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.c()));
-        if (index < 9) player.getInventory().setHeldItemSlot(index);
-        player.updateInventory();
-    }
-
-    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
-
-    @Override
-    public void setGameStateChangeReason(Object packet) {
-        gameStateChangeReason.set(packet, PacketPlayOutGameStateChange.d);
-    }
-
-    @Override
-    public void setPlayerBuildAbilities(Player player) {
-        ((CraftPlayer) player).getHandle().fO().d = true;
-        ((CraftPlayer) player).getHandle().fO().e = true;
-    }
-
-    @Override
-    public Material pathMaterial() {
-        return Material.DIRT_PATH;
-    }
-
-    private static final int threshold = 2048;
-
-    @Override
-    public boolean checkItemStack(ItemStack item) {
-        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
-        NBTTagCompound tag = nmsItem.v();
-        if (tag != null && tag.e("BlockEntityTag")) {
-            NBTTagCompound blockTag = tag.p("BlockEntityTag");
-            if (blockTag.e("Items")) {
-                return drillDown(blockTag.c("Items", 10), 0, 0) > threshold;
-            }
-        }
-
-        return false;
-    }
-
-    private int drillDown(NBTTagList items, int layer, int start) {
-        if (layer > 2) return start + threshold;
-        int invalid = start;
-        for (NBTBase nbtBase : items) {
-            if (!(nbtBase instanceof NBTTagCompound))
-                continue;
-            NBTTagCompound slot = (NBTTagCompound) nbtBase;
-            if (slot.e("tag")) {
-                invalid += slot.f("Count");
-                NBTTagCompound iTag = slot.p("tag");
-                if (iTag.e("BlockEntityTag")) {
-                    NBTTagCompound blockTag = iTag.p("BlockEntityTag");
-                    if (blockTag.e("Items")) {
-                        invalid = drillDown(blockTag.c("Items", 10), layer + 1, invalid);
-                    }
-                }
-            }
-            if (invalid > threshold)
-                break;
-        }
-        return invalid;
-    }
-
-    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
-
-    @Override
-    public Object resetExplosionKnockback(Object packet) {
-        PacketPlayOutExplosion packetPlayOutExplosion = (PacketPlayOutExplosion) packet;
-        return new PacketPlayOutExplosion(a.get(packetPlayOutExplosion), b.get(packetPlayOutExplosion), c.get(packetPlayOutExplosion), d.get(packetPlayOutExplosion), e.get(packetPlayOutExplosion), null);
-    }
-}
@@ -1,43 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-
-public class PlaceItemWrapper20 implements PlaceItemWrapper {
-
-    public PlaceItemWrapper20() {
-        for (Material material : Material.values()) {
-            if (!material.isBlock()) continue;
-            if (material.isLegacy()) continue;
-            BlockData blockData = material.createBlockData();
-            Material placementMaterial = blockData.getPlacementMaterial();
-            if (material == placementMaterial) continue;
-            if (placementMaterial == Material.AIR) continue;
-            if (placementMaterial.isItem() && !placementMaterial.isBlock()) {
-                ITEM_MATERIAL_TO_BLOCK_MATERIAL.put(placementMaterial, material);
-            }
-            if (material.name().contains("WALL")) {
-                BLOCK_MATERIAL_TO_WALL_BLOCK_MATERIAL.put(placementMaterial, material);
-            }
-        }
-    }
-}
@@ -1,51 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import net.minecraft.network.protocol.game.PacketPlayInFlying;
-import net.minecraft.server.level.EntityPlayer;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class PlayerMovementWrapper20 implements PlayerMovementWrapper {
-
-    @Override
-    public void setPosition(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
-        if (packetPlayInFlying.h) {
-            entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
-        } else {
-            entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
-        }
-    }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        Object packet = Reflection.newInstance(teleportPacket);
-        teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c,
-                packetPlayInFlying.h ? player.getLocation().getYaw() : packetPlayInFlying.d,
-                packetPlayInFlying.h ? player.getLocation().getPitch() : packetPlayInFlying.e);
-        return packet;
-    }
-}
@@ -1,36 +0,0 @@
-/*
- *   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
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-}
-
-dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore", "default"))
-
-    compileOnly(libs.paperapi21)
-
-    compileOnly(libs.nms21)
-}
@@ -1,133 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import de.steamwar.Reflection;
-import de.steamwar.bausystem.features.util.NoClipCommand;
-import io.papermc.paper.datacomponent.DataComponentTypes;
-import io.papermc.paper.datacomponent.item.ItemContainerContents;
-import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
-import net.minecraft.network.protocol.game.ClientboundExplodePacket;
-import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.entity.player.Abilities;
-import net.minecraft.world.level.GameType;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-import java.util.Optional;
-
-public class NMSWrapper21 implements NMSWrapper {
-
-    private static final Reflection.Field<ServerPlayerGameMode> playerInteractManager = Reflection.getField(ServerPlayer.class, null, ServerPlayerGameMode.class);
-    private static final Reflection.Field<GameType> playerGameMode = Reflection.getField(ServerPlayerGameMode.class, GameType.class, 0);
-
-    @Override
-    public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerGameMode.set(playerInteractManager.get(((CraftPlayer) player).getHandle()), GameType.byId(gameMode.getValue()));
-    }
-
-    @Override
-    public void setSlotToItemStack(Player player, Object o) {
-        ClientboundContainerSetSlotPacket packetPlayInSetCreativeSlot = (ClientboundContainerSetSlotPacket) o;
-        int index = packetPlayInSetCreativeSlot.getSlot();
-        if (index >= 36 && index <= 44) {
-            index -= 36;
-        } else if (index > 44) {
-            index -= 5;
-        } else if (index <= 8) {
-            index = index - 8 + 36;
-        }
-        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.getItem()));
-        if (index < 9) player.getInventory().setHeldItemSlot(index);
-        player.updateInventory();
-    }
-
-    private static final Reflection.Field<ClientboundGameEventPacket.Type> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, ClientboundGameEventPacket.Type.class, 14);
-
-    @Override
-    public void setGameStateChangeReason(Object packet) {
-        gameStateChangeReason.set(packet, ClientboundGameEventPacket.CHANGE_GAME_MODE);
-    }
-
-    @Override
-    public void setPlayerBuildAbilities(Player player) {
-        Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
-        abilities.mayBuild = true;
-        abilities.mayfly = true;
-    }
-
-    @Override
-    public Material pathMaterial() {
-        return Material.DIRT_PATH;
-    }
-
-    private static final int threshold = 2048;
-
-    @Override
-    public boolean checkItemStack(ItemStack item) {
-        ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
-        if (data == null) {
-            return false;
-        }
-
-        return drillDown(data.contents(), 0, 0) > threshold;
-    }
-
-    private int drillDown(List<ItemStack> items, int layer, int start) {
-        if (layer > 2) return start + threshold;
-        int invalid = start;
-        for (int i = start; i < items.size(); i++) {
-            ItemStack item = items.get(i);
-            if (item.isEmpty()) continue;
-
-            invalid += item.getAmount();
-
-            ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
-            if (data == null) {
-                continue;
-            }
-
-            List<ItemStack> subItems = data.contents();
-            if (subItems.size() > 1) {
-                invalid = drillDown(subItems, layer + 1, invalid);
-            }
-        }
-        return invalid;
-    }
-
-    @Override
-    public Object resetExplosionKnockback(Object packet) {
-        ClientboundExplodePacket explosion = (ClientboundExplodePacket) packet;
-
-        return new ClientboundExplodePacket(
-                explosion.center(),
-                Optional.empty(),
-                explosion.explosionParticle(),
-                explosion.explosionSound()
-        );
-    }
-}
@@ -1,150 +0,0 @@
-/*
- *   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.bausystem.utils;
-
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.Reflection;
-import de.steamwar.bausystem.BauSystem;
-import net.minecraft.network.protocol.game.ClientboundTickingStatePacket;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.ServerTickRateManager;
-import net.minecraft.world.TickRateManager;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class TickManager21 implements TickManager {
-    private static final ServerTickRateManager manager = MinecraftServer.getServer().tickRateManager();
-    private static final Reflection.Field<Integer> frozenTicksToRun = Reflection.getField(TickRateManager.class, int.class, 0);
-    private static final Reflection.Field<Long> remainingSprintTicks = Reflection.getField(ServerTickRateManager.class, long.class, 0);
-
-    private boolean blockTpsPacket = true;
-    private int totalSteps;
-
-    public TickManager21() {
-        TinyProtocol.instance.addFilter(ClientboundTickingStatePacket.class, this::blockPacket);
-    }
-
-    private Object blockPacket(Player player, Object packet) {
-        if (blockTpsPacket) {
-            return new ClientboundTickingStatePacket(20, manager.isFrozen());
-        } else {
-            return packet;
-        }
-    }
-
-    @Override
-    public boolean canFreeze() {
-        return true;
-    }
-
-    @Override
-    public void setBlockTpsPacket(boolean block) {
-        blockTpsPacket = block;
-        if (blockTpsPacket) {
-            ClientboundTickingStatePacket packet = new ClientboundTickingStatePacket(20, manager.isFrozen());
-            Bukkit.getOnlinePlayers().forEach(player -> TinyProtocol.instance.sendPacket(player, packet));
-        } else {
-            ClientboundTickingStatePacket packet = new ClientboundTickingStatePacket(manager.tickrate(), manager.isFrozen());
-            Bukkit.getOnlinePlayers().forEach(player -> TinyProtocol.instance.sendPacket(player, packet));
-        }
-    }
-
-    @Override
-    public void setTickRate(float tickRate) {
-        if (isFrozen()) {
-            setFreeze(false);
-        }
-        manager.setTickRate(tickRate);
-    }
-
-    @Override
-    public boolean isFrozen() {
-        return manager.isFrozen();
-    }
-
-    @Override
-    public void setFreeze(boolean freeze) {
-        manager.setFrozen(freeze);
-    }
-
-    @Override
-    public void stepTicks(int ticks) {
-        if (manager.isSprinting()) {
-            manager.stopSprinting();
-        } else if (manager.isSteppingForward()) {
-            manager.stopStepping();
-        }
-        this.totalSteps = ticks;
-        manager.setFrozen(true);
-        manager.stepGameIfPaused(ticks);
-        manager.setFrozen(false);
-        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), (bukkitTask) -> {
-            if (manager.isSteppingForward()) return;
-            manager.setFrozen(true);
-            bukkitTask.cancel();
-        }, 1, 1);
-        manager.tick();
-    }
-
-    @Override
-    public void sprintTicks(int ticks) {
-        if (manager.isSteppingForward()) {
-            manager.stopStepping();
-        } else if (manager.isSprinting()) {
-            manager.stopSprinting();
-        }
-        this.totalSteps = ticks;
-        manager.requestGameToSprint(ticks, true);
-    }
-
-    @Override
-    public boolean isSprinting() {
-        return manager.isSprinting();
-    }
-
-    @Override
-    public boolean isStepping() {
-        return manager.isSteppingForward();
-    }
-
-    @Override
-    public float getTickRate() {
-        return manager.tickrate();
-    }
-
-    @Override
-    public long getRemainingTicks() {
-        if (isSprinting()) {
-            return remainingSprintTicks.get(manager);
-        } else {
-            return frozenTicksToRun.get(manager);
-        }
-    }
-
-    @Override
-    public long getDoneTicks() {
-        return totalSteps - getRemainingTicks();
-    }
-
-    @Override
-    public long getTotalTicks() {
-        return totalSteps;
-    }
-}
@@ -26,8 +26,8 @@ tasks.compileJava {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }

 dependencies {
@@ -35,10 +35,12 @@ dependencies {
    annotationProcessor(libs.classindex)
    compileOnly(project(":SpigotCore", "default"))

-    compileOnly(libs.spigotapi)
    compileOnly(libs.axiom)
    compileOnly(libs.authlib)

+    compileOnly(libs.paperapi21)
+    compileOnly(libs.nms21)
+
    compileOnly(libs.fawe18)

    implementation(libs.luaj)
@@ -52,6 +52,9 @@ FLAG_ITEMS=Items
 FLAG_NO_GRAVITY = No Gravity
 FLAG_TESTBLOCK=Testblock
 FLAG_CHANGED=Changed
+FLAG_WATER_DESTROY=Water Destroy
+FLAG_WATER_DESTROY_ALLOW=§coff
+FLAG_WATER_DESTROY_DENY=§aon
 FLAG_FIRE_ALLOW=§con
 FLAG_FIRE_DENY=§aoff
 FLAG_FREEZE_ACTIVE=§aon
@@ -140,6 +143,7 @@ BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
 BAU_INFO_ITEM_LORE_NO_GRAVITY = §7NoGravity§8: §e{0}
 BAU_INFO_ITEM_LORE_TESTBLOCK=§7Testblock§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Changed§8: §e{0}
+BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Water Destroy§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Information regarding this build server
 BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -756,6 +760,9 @@ REGION_FIRE_DISABLED=§aFire damage activated in this region
 REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
 REGION_FREEZE_ENABLED=§cRegion frozen
 REGION_FREEZE_DISABLED=§aRegion thawed
+REGION_WATER_HELP=§8/§ewaterdestroy §8- §7Toggle water damage
+REGION_WATER_ENABLED=§aWater damage deactivated in this region
+REGION_WATER_DISABLED=§cWater damage activated in this region
 REGION_ITEMS_HELP=§8/§eitems §8- §7Toggle Items
 REGION_ITEMS_ENABLED=§aItems enabled in this region
 REGION_ITEMS_DISABLED=§cItems disabled in this region
@@ -1030,6 +1037,7 @@ SCHEMATIC_GUI_ITEM=§eSchematics
 # TNTListener
 TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1}
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8)
-TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener
-TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon
+TLS_START_HELP=§8/§etls start §8- §7Start the TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8- §7Stop the TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon
+TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle the TNT Listener
@@ -54,6 +54,9 @@ FLAG_FREEZE_ACTIVE=§aan
 FLAG_FREEZE_INACTIVE=§caus
 FLAG_PROTECT_ACTIVE=§aan
 FLAG_PROTECT_INACTIVE=§caus
+FLAG_WATER_DESTROY=Wasserschaden
+FLAG_WATER_DESTROY_ALLOW=§cerlaubt
+FLAG_WATER_DESTROY_DENY=§aaus
 FLAG_TNT_ALLOW=§aan
 FLAG_TNT_DENY=§caus
 FLAG_TNT_ONLY_TB=§7Kein §eBaurahmen
@@ -122,6 +125,7 @@ BAU_INFO_ITEM_NAME=§eBau-Management
 BAU_INFO_ITEM_LORE_FIRE=§7Feuer§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Farbe§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Verändert§8: §e{0}
+BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Wasserschaden§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Gibt Informationen über den Bau
 BAU_INFO_COMMAND_OWNER=§7Besitzer§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -704,6 +708,9 @@ REGION_PROTECT_FALSE_REGION=§cDu befindest dich derzeit in keiner (M)WG-Region
 REGION_NO_GRAVITY_HELP = §8/§enogravity §8- §7Toggle NoGravity
 REGION_NO_GRAVITY_ENABLED = §aNoGravity aktiviert in dieser Region
 REGION_NO_GRAVITY_DISABLED = §cNoGravity deaktiviert in dieser Region
+REGION_WATER_HELP=§8/§ewaterblock §8- §7Wasserschaden umschalten
+REGION_WATER_ENABLED=§aWasserschaden deaktiviert
+REGION_WATER_DISABLED=§cWasserschaden aktiviert
 REGION_REGION_HELP_UNDO=§8/§eregion undo §8- §7Mache die letzten 20 /testblock oder /reset rückgängig
 REGION_REGION_HELP_REDO=§8/§eregion redo §8- §7Wiederhole die letzten 20 §8/§7rg undo
 REGION_REGION_HELP_RESTORE=§8/§eregion restore §8- §7Setzte die Region zurück, ohne das Gebaute zu löschen
@@ -961,6 +968,7 @@ TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Erset
 # Schematics
 SCHEMATIC_GUI_ITEM=§eSchematics
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8)
-TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener
-TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan
+TLS_START_HELP=§8/§etls start §8- §7Starte den TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8- §7Stope den TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan
+TLS_TOGGLE_HELP=§8/§etls §8: §7Toggle den TNT Listener
@@ -1,18 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
 *
- * Copyright (C) 2025 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 the Free Software Foundation, either version 3
- * of the License, or (at your option) any later version.
+ *   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.
+ *   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/>.
+ *   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;
@@ -32,18 +34,21 @@ import de.steamwar.bausystem.features.world.BauScoreboard;
 import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.utils.ScoreboardElement;
-import de.steamwar.bausystem.utils.TickListener;
 import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.CRIUSleepEvent;
+import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
+import de.steamwar.core.WorldIdentifier;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
+import de.steamwar.providers.BauServerInfo;
 import lombok.Getter;
 import org.bukkit.Bukkit;
+import org.bukkit.GameRule;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -69,7 +74,6 @@ public class BauSystem extends JavaPlugin implements Listener {
    @Getter
    private static BauSystem instance;

-    @Getter
    private SpigotLinker linker;

    @Override
@@ -119,14 +123,18 @@ public class BauSystem extends JavaPlugin implements Listener {
        } catch (AbstractLinker.LinkException e) {
            getLogger().log(Level.SEVERE, "Could not link a class.", e);
            Bukkit.shutdown();
+            return;
        }

-        TickListener.impl.init();
-
        TraceManager.instance.init();
        TraceRecorder.instance.init();

        new WorldEditRendererCUIEditor();
+
+        Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
+
+        String identifier = BauServerInfo.getOwnerUser().getUUID().toString().replace("-", "");
+        WorldIdentifier.set("bau/" + Core.getVersion() + "/" + identifier);
    }

    @EventHandler
@@ -182,8 +190,7 @@ public class BauSystem extends JavaPlugin implements Listener {

            @Override
            public void run() {
-                if (TickManager.impl.isFrozen())
-                    return;
+                if (TickManager.impl.isFrozen()) return;
                if (counter >= delay) {
                    runnable.run();
                    cancel();
@@ -201,8 +208,7 @@ public class BauSystem extends JavaPlugin implements Listener {

            @Override
            public void run() {
-                if (TickManager.impl.isFrozen())
-                    return;
+                if (TickManager.impl.isFrozen()) return;
                if (counter >= (first ? delay : period)) {
                    first = false;
                    runnable.run();
@@ -218,4 +224,4 @@ public class BauSystem extends JavaPlugin implements Listener {
        AtomicReference<BukkitTask> task = new AtomicReference<>();
        task.set(runTaskTimer(plugin, () -> consumer.accept(task.get()), delay, period));
    }
-}
+}
@@ -27,8 +27,6 @@ import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
 import org.bukkit.entity.Player;

-import java.util.HashSet;
-import java.util.Set;
 import java.util.function.Predicate;

@AllArgsConstructor
@@ -39,13 +37,12 @@ public enum Permission {
        return bauweltMember.isSupervisor();
    }),
    BUILD(bauweltMember -> {
-        if (isTempOnlySpectator(bauweltMember)) return false;
        return bauweltMember.isBuild() || SUPERVISOR.permissionPredicate.test(bauweltMember);
    }),
    /**
     * Only used for {@link BauMemberUpdate}
     */
-    REAL_SPECTATOR(bauweltMember -> {
+    SPECTATOR(bauweltMember -> {
        return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
    }),
    /**
@@ -55,28 +52,6 @@ public enum Permission {
        return true;
    });

-    private static final Set<Integer> TEMP_ONLY_SPECTATOR = new HashSet<>();
-
-    private static boolean isTempOnlySpectator(BauweltMember bauweltMember) {
-        return TEMP_ONLY_SPECTATOR.contains(bauweltMember.getMemberID());
-    }
-    
-    public static boolean isTempOnlySpectator(Player player) {
-        return TEMP_ONLY_SPECTATOR.contains(SteamwarUser.get(player.getUniqueId()).getId());
-    }
-
-    public static void forceOnlySpectator(Player player) {
-        TEMP_ONLY_SPECTATOR.add(SteamwarUser.get(player.getUniqueId()).getId());
-        BauMemberUpdate.baumemberUpdate();
-    }
-
-    /**
-     * Only used by {@link BauMemberUpdate}
-     */
-    public static void removeForceOnlySpectator(Player player) {
-        TEMP_ONLY_SPECTATOR.remove(SteamwarUser.get(player.getUniqueId()).getId());
-    }
-
    private final Predicate<BauweltMember> permissionPredicate;

    public boolean hasPermission(BauweltMember bauweltMember) {
@@ -86,10 +61,10 @@ public enum Permission {

    public boolean hasPermission(Player member) {
        if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
-            return this != REAL_SPECTATOR;
+            return this != SPECTATOR;
        }
        BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (bauweltMember == null) return this == REAL_SPECTATOR;
+        if (bauweltMember == null) return this == SPECTATOR;
        return permissionPredicate.test(bauweltMember);
    }
 }
@@ -36,7 +36,7 @@ public class BauServer {
    private Integer owner;

    public UUID getOwner() {
-        return SteamwarUser.get(getOwnerID()).getUUID();
+        return SteamwarUser.byId(getOwnerID()).getUUID();
    }

    public int getOwnerID() {
@@ -32,6 +32,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Chest;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -120,6 +121,7 @@ public class AutostartListener implements Listener {

    @EventHandler
    public void onEntityExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) return;
        if (regionStartTime.isEmpty()) {
            return;
        }
@@ -59,7 +59,7 @@ public class BackupCommand extends SWCommand {
        if (checkGlobalRegion(region, p)) {
            return;
        }
-        if (region.getFlags().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
+        if (region.getRegionData().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
            BauSystem.MESSAGE.send("BACKUP_CREATE_NO_CHANGE", p);
            return;
        }
@@ -56,8 +56,8 @@ public class BauInfoBauGuiItem extends BauGuiItem {
        Region region = Region.getRegion(player.getLocation());
        List<String> stringList = new ArrayList<>();
        for (Flag flag : Flag.getFlags()) {
-            if (!region.getFlags().has(flag).isApplicable()) continue;
-            FlagOptional<?> value = region.getFlags().get(flag);
+            if (!region.getRegionData().has(flag).isApplicable()) continue;
+            FlagOptional<?> value = region.getRegionData().get(flag);
            if (value.isPresent()) {
                stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), player)));
            }
@@ -1,71 +0,0 @@
-/*
- *   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.bausystem.features.bau;
-
-import de.steamwar.bausystem.Permission;
-import de.steamwar.command.PreviousArguments;
-import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeMapper;
-import de.steamwar.linkage.Linked;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-@Linked
-public class ForceSpectatorCommand extends SWCommand {
-
-    public ForceSpectatorCommand() {
-        super("forcespectator");
-    }
-
-    @Register
-    public void forceSpectator(@Validator("supervisor") Player player, @Mapper("builder") Player other) {
-        Permission.forceOnlySpectator(other);
-    }
-
-    @Mapper("builder")
-    public TypeMapper<Player> spectatorMapper() {
-        return new TypeMapper<>() {
-            @Override
-            public Player map(CommandSender commandSender, String[] previousArguments, String s) {
-                Player player = Bukkit.getPlayer(s);
-                if (player == null) {
-                    return null;
-                }
-                if (Permission.BUILD.hasPermission(player) && !Permission.SUPERVISOR.hasPermission(player)) {
-                    return player;
-                }
-                return null;
-            }
-
-            @Override
-            public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
-                return Bukkit.getOnlinePlayers().stream()
-                        .filter(Permission.BUILD::hasPermission)
-                        .filter(player -> !Permission.SUPERVISOR.hasPermission(player))
-                        .map(Player::getName)
-                        .collect(Collectors.toList());
-            }
-        };
-    }
-}
@@ -47,11 +47,11 @@ public class InfoCommand extends SWCommand {

    @Register(description = "BAU_INFO_COMMAND_HELP")
    public void genericCommand(Player p) {
-        BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
+        BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.byId(bauServer.getOwnerID()).getUserName());
        Region region = Region.getRegion(p.getLocation());
        for (Flag flag : Flag.getFlags()) {
-            if (!region.getFlags().has(flag).isApplicable()) continue;
-            FlagOptional<?> value = region.getFlags().get(flag);
+            if (!region.getRegionData().has(flag).isApplicable()) continue;
+            FlagOptional<?> value = region.getRegionData().get(flag);
            if (value.isPresent()) {
                BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), p));
            }
@@ -97,7 +97,7 @@ public class InfoCommand extends SWCommand {
                st.append("§8, ");
            }
            st.append("§7");
-            st.append(SteamwarUser.get(bauweltMembers.get(i).getMemberID()).getUserName());
+            st.append(SteamwarUser.byId(bauweltMembers.get(i).getMemberID()).getUserName());
        }
        return st.toString();
    }
@@ -21,9 +21,10 @@ package de.steamwar.bausystem.features.countingwand;

 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
-import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.ItemUtils;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWItem;
+import lombok.Data;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -31,13 +32,32 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;

 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-

@UtilityClass
 public class Countingwand {

+    @Data
+    public class CountingWandComponent implements SWPlayer.Component {
+        private Point pos1;
+        private Point pos2;
+
+        public boolean setPosition(boolean pos1, Point point) {
+            if (this.pos1 == null || this.pos2 == null) {
+                this.pos1 = point;
+                this.pos2 = point;
+                return true;
+            }
+            Point current = pos1 ? this.pos1 : this.pos2;
+            if (current.equals(point)) return false;
+            if (pos1) {
+                this.pos1 = point;
+            } else {
+                this.pos2 = point;
+            }
+            return true;
+        }
+    }
+
 	public static ItemStack getWandItem(Player player) {
 		ItemStack itemStack = new SWItem(Material.STICK, BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE1", player), BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE2", player)), false, null).getItemStack();
 		ItemUtils.setItem(itemStack, "countingwand");
@@ -47,61 +67,20 @@ public class Countingwand {
 		return itemStack;
 	}

-	private final Map<String, Pair<Point, Point>> selections = new HashMap<>();
+    public boolean isCountingwand(ItemStack itemStack) {
+        return ItemUtils.isItem(itemStack, "countingwand");
+    }

-	public boolean isCountingwand(ItemStack itemStack) {
-		return ItemUtils.isItem(itemStack, "countingwand");
-	}
-
-	public void checkSelection(final Point point, final boolean pos1, final Player p) {
-		Pair<Point, Point> selection = selections.get(p.getUniqueId().toString());
-		final boolean newPos;
-		if (selection != null) {
-			if (pos1) {
-				newPos = !point.equals(selection.setKey(point));
-			} else {
-				newPos = !point.equals(selection.setValue(point));
-			}
-		} else {
-			if (pos1) {
-				selection = new Pair<>(point, null);
-			} else {
-				selection = new Pair<>(null, point);
-			}
-			selections.put(p.getUniqueId().toString(), selection);
-			newPos = true;
-		}
-
-		if (newPos) {
-			String dimension = getDimensions(p, selection.getKey(), selection.getValue());
-			String volume = getVolume(p, selection.getKey(), selection.getValue());
-			if (pos1) {
-				BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_RCLICK", p, point.getX(), point.getY(), point.getZ(), dimension, volume);
-			} else {
-				BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_LCLICK", p, point.getX(), point.getY(), point.getZ(), dimension, volume);
-			}
-		}
-	}
-
-	public void removePlayer(Player p) {
-		selections.remove(p.getUniqueId().toString());
-	}
-
-	public String getVolume(Player player, final Point point1, final Point point2) {
-		if (point1 == null || point2 == null) {
-			return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_VOLUME", player, 0);
-		}
-		return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_VOLUME", player, getAmount(point1, point2));
-	}
-
-	public String getDimensions(Player player, final Point point1, final Point point2) {
-		if (point1 == null || point2 == null) {
-			return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_DIMENSION", player, 0, 0, 0);
-		}
-		return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_DIMENSION", player, Math.abs(point1.getX() - point2.getX()) + 1, Math.abs(point1.getY() - point2.getY()) + 1, Math.abs(point1.getZ() - point2.getZ()) + 1);
-	}
-
-	public int getAmount(final Point point1, final Point point2) {
-		return (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
-	}
+    public void checkSelection(final Point point, final boolean pos1, final Player p) {
+        SWPlayer player = SWPlayer.of(p);
+        CountingWandComponent countingWandComponent = player.getComponentOrDefault(CountingWandComponent.class, CountingWandComponent::new);
+        if (countingWandComponent.setPosition(pos1, point)) {
+            Point point1 = countingWandComponent.pos1;
+            Point point2 = countingWandComponent.pos2;
+            int amount = (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
+            String dimension = player.using(BauSystem.MESSAGE).parse("COUNTINGWAND_MESSAGE_VOLUME", amount);
+            String volume = player.parse("COUNTINGWAND_MESSAGE_DIMENSION", Math.abs(point1.getX() - point2.getX()) + 1, Math.abs(point1.getY() - point2.getY()) + 1, Math.abs(point1.getZ() - point2.getZ()) + 1);
+            player.sendMessage(pos1 ? "COUNTINGWAND_MESSAGE_RCLICK" : "COUNTINGWAND_MESSAGE_LCLICK", point.getX(), point.getY(), point.getZ(), dimension, volume);
+        }
+    }
 }
@@ -27,7 +27,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.util.RayTraceResult;

 import java.util.Objects;
@@ -67,9 +66,4 @@ public class CountingwandListener implements Listener {
 		event.setCancelled(true);
 		Countingwand.checkSelection(Point.fromLocation(Objects.requireNonNull(event.getClickedBlock()).getLocation()), false, event.getPlayer());
 	}
-
-	@EventHandler
-	public void onLeave(PlayerQuitEvent event) {
-		Countingwand.removePlayer(event.getPlayer());
-	}
 }
@@ -31,10 +31,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

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

 public class DesignEndStone {
@@ -56,11 +53,10 @@ public class DesignEndStone {
        this.maxY = region.getBuildArea().getMaxPoint(false).getY();
        this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();

-        limited = region.getGameModeConfig().Schematic.Limited
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getValue() == 0)
-                .flatMap(entry -> entry.getKey().stream())
+        limited = Arrays.stream(Material.values())
+                .filter(Material::isBlock)
+                .filter(material -> !material.isLegacy())
+                .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
                .collect(Collectors.toSet());
        calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;

@@ -25,8 +25,11 @@ import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.autostart.AutostartListener;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.entity.RFallingBlockEntity;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -45,7 +48,28 @@ import java.util.*;
@UtilityClass
 public class Detonator {

-    private static final Map<Player, REntityServer> ENTITIES_MAP = new HashMap<>();
+    public class DetonatorComponent implements SWPlayer.Component {
+        private final REntityServer entities = new REntityServer();
+
+        @Getter
+        @Setter
+        private boolean hasUpdated = false;
+
+        @Override
+        public void onMount(SWPlayer player) {
+            entities.addPlayer(player.getPlayer());
+            entities.setCallback((player1, entity, action) -> {
+                Vector vector = new Vector(entity.getX(), entity.getY(), entity.getZ());
+                DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player1);
+            });
+        }
+
+        @Override
+        public void onUnmount(SWPlayer player) {
+            entities.close();
+        }
+    }
+
    private static final Vector HALF = new Vector(0.5, 0, 0.5);

    public static boolean isDetonator(ItemStack itemStack) {
@@ -53,28 +77,19 @@ public class Detonator {
    }

    public static void showDetonator(Player p, List<Location> locs) {
-        if (ENTITIES_MAP.containsKey(p)) return;
-        REntityServer entities = new REntityServer();
-        entities.setCallback((player, rEntity, entityAction) -> {
-            Vector vector = new Vector(rEntity.getX(), rEntity.getY(), rEntity.getZ());
-            DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player);
-            DetonatorListener.HAS_UPDATED.add(player);
-        });
-        entities.addPlayer(p);
-        ENTITIES_MAP.put(p, entities);
-
+        DetonatorComponent detonatorComponent = SWPlayer.of(p).getComponentOrDefault(DetonatorComponent.class, DetonatorComponent::new);
        locs.forEach(location -> {
-            RFallingBlockEntity entity = new RFallingBlockEntity(entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
+            RFallingBlockEntity entity = new RFallingBlockEntity(detonatorComponent.entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
            entity.setNoGravity(true);
        });
    }

    public static void hideDetonator(Player p) {
-        ENTITIES_MAP.remove(p).close();
+        SWPlayer.of(p).removeComponent(DetonatorComponent.class);
    }

    public static boolean hasActiveDetonatorShow(Player p) {
-        return ENTITIES_MAP.containsKey(p);
+        return SWPlayer.of(p).hasComponent(DetonatorComponent.class);
    }

    public static void activateDetonator(DetonatorStorage detonator) {
@@ -24,6 +24,7 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -36,15 +37,11 @@ import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;

-import java.util.HashSet;
-import java.util.Set;
-
@Linked
 public class DetonatorListener implements Listener {

-    static final Set<Player> HAS_UPDATED = new HashSet<>();
-
    static void addLocationToDetonator(Location location, Player p) {
+        SWPlayer.of(p).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
        Detoblock detoblock = Detonator.getBlock(location.getBlock());
        if (detoblock == Detoblock.INVALID) {
            SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("DETONATOR_INVALID_BLOCK", p));
@@ -66,64 +63,59 @@ public class DetonatorListener implements Listener {

    @EventHandler
    public void onBlockBreak(BlockBreakEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        Player p = event.getPlayer();
        if (Detonator.isDetonator(p.getInventory().getItemInMainHand())) {
            event.setCancelled(true);
            addLocationToDetonator(event.getBlock().getLocation(), p);
-            HAS_UPDATED.add(event.getPlayer());
        }
    }

    @EventHandler
    public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Detonator.isDetonator(event.getItem())) {
-            return;
-        }
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Detonator.isDetonator(event.getItem())) return;

        if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
            event.setCancelled(true);
            DetonatorStorage detonator = new ItemStorage(event.getPlayer());
            Detonator.activateDetonator(detonator);
-            HAS_UPDATED.add(event.getPlayer());
+            SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
        }
    }

    @EventHandler(ignoreCancelled = true)
    public void onPlayerMove(PlayerMoveEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer()) ||!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer()) || !Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
            if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
                Detonator.hideDetonator(event.getPlayer());
            }
-        } else {
-            if (!Detonator.hasActiveDetonatorShow(event.getPlayer())) {
-                Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
-            }
+            return;
        }
-
-        if (HAS_UPDATED.contains(event.getPlayer())) {
-            HAS_UPDATED.remove(event.getPlayer());
-            if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
-                Detonator.hideDetonator(event.getPlayer());
-                Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
-            }
+        if (!Detonator.hasActiveDetonatorShow(event.getPlayer())) {
+            Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
+            return;
        }
+        Detonator.DetonatorComponent component = SWPlayer.of(event.getPlayer())
+                .getComponentAndFilter(Detonator.DetonatorComponent.class, Detonator.DetonatorComponent::isHasUpdated)
+                .orElse(null);
+        if (component == null) return;
+        component.setHasUpdated(false);
+        Detonator.hideDetonator(event.getPlayer());
+        Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
    }

    @EventHandler
    public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
-            HAS_UPDATED.add(event.getPlayer());
-        }
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) return;
+        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
    }

    @EventHandler
    public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem())) {
-            HAS_UPDATED.add(event.getPlayer());
-        }
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!(Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem()))) return;
+        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
    }
 }
@@ -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);
+        }
+    }
+}
@@ -26,6 +26,7 @@ import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
 import de.steamwar.bausystem.features.loader.elements.impl.LoaderTNT;
 import de.steamwar.bausystem.features.loader.elements.impl.LoaderWait;
 import de.steamwar.bausystem.shared.EnumDisplay;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
@@ -40,21 +41,17 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.player.PlayerQuitEvent;

 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;

-public class Loader implements Listener {
-
-    private static final Map<Player, Loader> LOADER_MAP = new HashMap<>();
+public class Loader implements Listener, SWPlayer.Component {

    public static Loader getLoader(Player player) {
-        return LOADER_MAP.get(player);
+        return SWPlayer.of(player).getComponent(Loader.class).orElse(null);
    }

    public static void newLoader(Player player) {
-        LOADER_MAP.put(player, new Loader(player));
+        SWPlayer.of(player).setComponent(new Loader(player));
    }

    private final Player p;
@@ -145,7 +142,7 @@ public class Loader implements Listener {
            recorder = null;
        }
        elements.clear();
-        LOADER_MAP.remove(p);
+        SWPlayer.of(p).removeComponent(Loader.class);
    }

    public boolean setTicksBetweenShots(int delay) {
@@ -29,6 +29,7 @@ import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
@@ -156,6 +157,7 @@ public class Loadtimer implements Listener {
    }

    public void onTntExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) return;
        if (region.getBuildArea().inRegion(event.getLocation(), true) && stage == Stage.IGNITION) {
            stage = Stage.END;
            explode = TPSUtils.currentRealTick.get();
@@ -19,8 +19,8 @@

 package de.steamwar.bausystem.features.observer;

-import de.steamwar.Reflection;
 import de.steamwar.bausystem.region.Point;
+import de.steamwar.core.SWPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;
@@ -28,13 +28,14 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.Bisected;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Observer;
 import org.bukkit.block.data.type.*;
+import org.bukkit.block.data.type.Observer;
+import org.bukkit.craftbukkit.block.impl.CraftPoweredRail;
 import org.bukkit.entity.Player;

 import java.util.*;

-public class ObserverTracer {
+public class ObserverTracer implements SWPlayer.Component {

    private static final Set<BlockFace> ALLOWED = EnumSet.of(BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST, BlockFace.UP, BlockFace.DOWN);

@@ -170,7 +171,6 @@ public class ObserverTracer {
        }
    }

-    private static final Class<?> craftPoweredRail = Reflection.getClass("org.bukkit.craftbukkit.block.impl.CraftPoweredRail");
    private boolean checkAllowed(Block block, BlockData blockData) {
        if (checkMaterial(block)) return true;
        if (block.getType() == Material.BELL) {
@@ -179,7 +179,7 @@ public class ObserverTracer {

        return blockData instanceof Door
                || blockData instanceof Gate
-                || craftPoweredRail.isInstance(blockData)
+                || blockData instanceof CraftPoweredRail
                || blockData instanceof TrapDoor
                || blockData instanceof GlassPane;
    }
@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.observer;

 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.command.SWCommand;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;

@@ -41,23 +42,23 @@ public class ObserverTracerCommand extends SWCommand {
    @Register(value = "disable", description = "OBSERVER_HELP_DISABLE")
    public void disable(Player p) {
        ObserverTracerListener.enabled.remove(p);
-        ObserverTracerListener.observerTracerMap.remove(p);
+        SWPlayer.of(p).removeComponent(ObserverTracer.class);
        BauSystem.MESSAGE.send("OBSERVER_DISABLE", p);
    }

    @Register(value = "delete", description = "OBSERVER_HELP_DELETE")
    public void delete(@Validator Player p) {
-        ObserverTracerListener.observerTracerMap.remove(p);
+        SWPlayer.of(p).removeComponent(ObserverTracer.class);
        BauSystem.MESSAGE.send("OBSERVER_DELETE", p);
    }

    @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE")
    public void retrace(@Validator Player p) {
-        if (ObserverTracerListener.observerTracerMap.containsKey(p)) {
+        if (SWPlayer.of(p).hasComponent(ObserverTracer.class)) {
            BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p);
            return;
        }
-        ObserverTracerListener.observerTracerMap.get(p).trace();
+        SWPlayer.of(p).getComponent(ObserverTracer.class).ifPresent(ObserverTracer::trace);
        BauSystem.MESSAGE.send("OBSERVER_RETRACE_DONE", p);
    }
 }
@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.observer;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -34,23 +35,19 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;

-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;

@Linked
 public class ObserverTracerListener implements Listener {

    static Set<Player> enabled = new HashSet<>();
-    static Map<Player, ObserverTracer> observerTracerMap = new HashMap<>();

    public ObserverTracerListener() {
        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-            observerTracerMap.forEach((player, observerTracer) -> {
-                if (player.getGameMode() == GameMode.SPECTATOR) {
-                    observerTracer.show();
-                }
+            SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
+                if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
+                pair.getComponent().show();
            });
        }, 15L, 15L);
    }
@@ -58,20 +55,16 @@ public class ObserverTracerListener implements Listener {
    @EventHandler
    public void onPlayerInteract(PlayerInteractEvent event) {
        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!enabled.contains(event.getPlayer())) {
-            return;
-        }
-        if (event.getClickedBlock() == null) {
-            return;
-        }
-        if (observerTracerMap.containsKey(event.getPlayer())) {
-            ObserverTracer observerTracer = observerTracerMap.get(event.getPlayer());
+        if (!enabled.contains(event.getPlayer())) return;
+        if (event.getClickedBlock() == null) return;
+        ObserverTracer observerTracer = SWPlayer.of(event.getPlayer()).getComponent(ObserverTracer.class).orElse(null);
+        if (observerTracer != null) {
            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                if (!observerTracer.trace()) {
                    createNew(event);
                }
-                observerTracerMap.forEach((player, o) -> {
-                    o.trace();
+                SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
+                    pair.getComponent().trace();
                });
            }, 1L);
        } else {
@@ -86,13 +79,13 @@ public class ObserverTracerListener implements Listener {
        if (event.getClickedBlock().getType() == Material.OBSERVER) {
            ObserverTracer observerTracer = new ObserverTracer(event.getPlayer(), event.getClickedBlock());
            observerTracer.trace();
-            observerTracerMap.put(event.getPlayer(), observerTracer);
+            SWPlayer.of(event.getPlayer()).setComponent(observerTracer);
        }
    }

    @EventHandler
    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(observerTracerMap::remove);
+        event.getNewBuilder().forEach(player -> SWPlayer.of(player).removeComponent(ObserverTracer.class));
    }

    @EventHandler
@@ -103,6 +96,5 @@ public class ObserverTracerListener implements Listener {
    @EventHandler
    public void onPlayerQuit(PlayerQuitEvent event) {
        enabled.remove(event.getPlayer());
-        observerTracerMap.remove(event.getPlayer());
    }
 }
@@ -51,17 +51,17 @@ public class ColorCommand extends SWCommand {
    public void genericColorSet(@Validator Player p, ColorMode color, ColorizationType colorizationType) {
        if (colorizationType == ColorizationType.GLOBAL) {
            Region.getRegions().forEach(region -> {
-                region.getFlags().set(Flag.COLOR, color);
+                region.getRegionData().set(Flag.COLOR, color);
            });
            BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, BauSystem.MESSAGE.parse(color.getChatValue(), p));
            return;
        }
        Region region = Region.getRegion(p.getLocation());
-        if (!region.getFlags().has(Flag.COLOR).isWritable()) {
+        if (!region.getRegionData().has(Flag.COLOR).isWritable()) {
            BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
            return;
        }
-        region.getFlags().set(Flag.COLOR, color);
+        region.getRegionData().set(Flag.COLOR, color);
        try {
            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                    .ignoreAir(true)
@@ -53,11 +53,11 @@ public class FireCommand extends SWCommand {
    }

    private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
-            region.getFlags().set(Flag.FIRE, FireMode.DENY);
+        if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+            region.getRegionData().set(Flag.FIRE, FireMode.DENY);
            return true;
        } else {
-            region.getFlags().set(Flag.FIRE, FireMode.ALLOW);
+            region.getRegionData().set(Flag.FIRE, FireMode.ALLOW);
            return false;
        }
    }
@@ -36,12 +36,12 @@ public class FireListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onFireDamage(BlockBurnEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
    }

    @EventHandler
    public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
    }

    @Override
@@ -56,7 +56,7 @@ public class FireListener implements Listener, ScoreboardElement {

    @Override
    public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FIRE).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FIRE).getWithDefault().getChatValue(), p);
    }
 }
@@ -53,11 +53,11 @@ public class FreezeCommand extends SWCommand {
    }

    private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
-            region.getFlags().set(Flag.FREEZE, FreezeMode.INACTIVE);
+        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+            region.getRegionData().set(Flag.FREEZE, FreezeMode.INACTIVE);
            return false;
        } else {
-            region.getFlags().set(Flag.FREEZE, FreezeMode.ACTIVE);
+            region.getRegionData().set(Flag.FREEZE, FreezeMode.ACTIVE);
            return true;
        }
    }
@@ -46,9 +46,19 @@ import org.bukkit.event.player.PlayerInteractEvent;
@Linked
 public class FreezeListener implements Listener, ScoreboardElement {

+    @EventHandler
+    public void onBlockExplode(BlockExplodeEvent e) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        e.setCancelled(true);
+        BlockState state = e.getBlock().getState();
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            state.update(true, false);
+        }, 1L);
+    }
+
    @EventHandler
    public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
        e.setCancelled(true);
        if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -60,7 +70,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
    @EventHandler
    public void onBlockCanBuild(BlockCanBuildEvent e) {
        if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
        if (e.getMaterial() == Material.TNT) {
            e.setBuildable(false);
            e.getBlock().setType(Material.TNT, false);
@@ -69,14 +79,14 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onPhysicsEvent(BlockPhysicsEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            if (e.getSourceBlock().getType() == Material.NOTE_BLOCK) {
                BlockState state = e.getSourceBlock().getState();
                NoteBlock noteBlock = (NoteBlock) state.getBlockData();
@@ -101,44 +111,44 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onPistonExtend(BlockPistonExtendEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onPistonRetract(BlockPistonRetractEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onBlockGrow(BlockGrowEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onRedstoneEvent(BlockRedstoneEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setNewCurrent(e.getOldCurrent());
        }
    }

    @EventHandler
    public void onBlockDispense(BlockDispenseEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onInventoryMoveEvent(InventoryMoveItemEvent e) {
-        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
-        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }
@@ -147,7 +157,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
    public void onBlockBreak(BlockBreakEvent e) {
        if (Core.getVersion() < 19) return;
        if (e.getPlayer().getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) return;
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
            e.getBlock().setType(Material.BARRIER, false);
            e.getBlock().setType(Material.AIR, false);
@@ -170,35 +180,35 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onFluidLevelChange(FluidLevelChangeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onBlockSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onBlockFromTo(BlockFromToEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onSpongeAbsorb(SpongeAbsorbEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }

    @EventHandler
    public void onBlockForm(BlockFormEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }
@@ -206,7 +216,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
    @EventHandler
    public void onPlayerInteract(PlayerInteractEvent e) {
        if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        if (Region.getRegion(e.getClickedBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getClickedBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            Block block = e.getClickedBlock();
            if (block.getType() == Material.LEVER) {
                Switch data = ((Switch) block.getBlockData());
@@ -218,7 +228,7 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onBlockFade(BlockFadeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
        }
    }
@@ -235,7 +245,7 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @Override
    public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
    }
 }
@@ -55,11 +55,11 @@ public class ItemsCommand extends SWCommand {
    }

    private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
-            region.getFlags().set(Flag.ITEMS, ItemMode.INACTIVE);
+        if (region.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
+            region.getRegionData().set(Flag.ITEMS, ItemMode.INACTIVE);
            return false;
        } else {
-            region.getFlags().set(Flag.ITEMS, ItemMode.ACTIVE);
+            region.getRegionData().set(Flag.ITEMS, ItemMode.ACTIVE);
            return true;
        }
    }
@@ -37,7 +37,7 @@ public class ItemsListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onItemSpawn(ItemSpawnEvent event) {
-        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
+        if (Region.getRegion(event.getLocation()).getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
            event.setCancelled(true);
        }
    }
@@ -54,7 +54,7 @@ public class ItemsListener implements Listener, ScoreboardElement {

    @Override
    public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
    }
 }
@@ -53,11 +53,11 @@ public class NoGravityCommand extends SWCommand {
    }

    private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
-            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
+        if (region.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+            region.getRegionData().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
            return false;
        } else {
-            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
+            region.getRegionData().set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
            return true;
        }
    }
@@ -37,7 +37,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
    @EventHandler
    public void onEntitySpawn(EntitySpawnEvent event) {
        if (event.getEntityType() == EntityType.PLAYER) return;
-        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+        if (Region.getRegion(event.getLocation()).getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
            event.getEntity().setGravity(false);
        }
    }
@@ -54,7 +54,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {

    @Override
    public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
    }
 }
@@ -39,18 +39,18 @@ public class ProtectCommand extends SWCommand {
    public void genericProtectCommand(@Validator Player p) {
        Region region = regionCheck(p);
        if (region == null) return;
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
-            region.getFlags().set(Flag.PROTECT, ProtectMode.INACTIVE);
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+            region.getRegionData().set(Flag.PROTECT, ProtectMode.INACTIVE);
            RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
        } else {
-            region.getFlags().set(Flag.PROTECT, ProtectMode.ACTIVE);
+            region.getRegionData().set(Flag.PROTECT, ProtectMode.ACTIVE);
            RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
        }
    }

    private Region regionCheck(Player player) {
        Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
+        if (!region.getRegionData().has(Flag.PROTECT).isApplicable()) {
            BauSystem.MESSAGE.send("REGION_PROTECT_FALSE_REGION", player);
            return null;
        }
@@ -41,7 +41,7 @@ public class ProtectListener implements Listener, ScoreboardElement {

    private void explode(List<Block> blockList, Location location) {
        Region region = Region.getRegion(location);
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return;
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return;
        Point p1 = region.getBuildArea().getMinPoint(true);
        Point p2 = region.getTestblockArea().getMinPoint(true);
        int floorLevel = Math.min(p1.getY(), p2.getY());
@@ -70,7 +70,7 @@ public class ProtectListener implements Listener, ScoreboardElement {

    @Override
    public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
    }
 }
@@ -102,7 +102,7 @@ public class RegionCommand extends SWCommand {
        try {
            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                    .ignoreAir(true)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
            region.getArea().reset(pasteBuilder, false);
            RegionUtils.message(region, "REGION_REGION_RESTORED");
        } catch (SecurityException e) {
@@ -124,7 +124,7 @@ public class RegionCommand extends SWCommand {
        try {
            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
                    .ignoreAir(true)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
            region.getArea().reset(pasteBuilder, false);
            RegionUtils.message(region, "REGION_REGION_RESTORED");
        } catch (SecurityException e) {
@@ -182,6 +182,6 @@ public class RegionListener implements Listener {
    }

    private static void tagChangedRegion(final Location location) {
-        Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
+        Region.getRegion(location).getRegionData().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
    }
 }
@@ -53,9 +53,8 @@ public class ResetCommand extends SWCommand {
        if (region == null) return;
        try {
            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
            region.getArea().reset(pasteBuilder, false);
-            region.getFlags().clear();
            region.getRegionData().clear();
            RegionUtils.message(region, "REGION_RESET_RESETED");
        } catch (SecurityException e) {
@@ -84,7 +83,7 @@ public class ResetCommand extends SWCommand {
        }
        try {
            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
            region.getArea().reset(pasteBuilder, true);
            RegionUtils.message(region, "REGION_RESET_RESETED");
        } catch (SecurityException e) {
@@ -92,7 +92,7 @@ public class TNTCommand extends SWCommand {
            @Override
            public List<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                if (region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                    return new ArrayList<>(tntModeMap.keySet());
                } else {
                    return new ArrayList<>(tntModeMapReduced.keySet());
@@ -102,7 +102,7 @@ public class TNTCommand extends SWCommand {
            @Override
            public TNTMode map(CommandSender sender, PreviousArguments previousArguments, String s) {
                Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                if (region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                    return tntModeMap.getOrDefault(s, null);
                } else {
                    return tntModeMapReduced.getOrDefault(s, null);
@@ -124,23 +124,23 @@ public class TNTCommand extends SWCommand {
    }

    private void tntToggle(Region region, TNTMode requestedMode, String requestedMessage) {
-        if (requestedMode != null && region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
-            region.getFlags().set(Flag.TNT, requestedMode);
+        if (requestedMode != null && region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+            region.getRegionData().set(Flag.TNT, requestedMode);
            RegionUtils.actionBar(region, requestedMessage);
            return;
        }
-        switch (region.getFlags().get(Flag.TNT).getWithDefault()) {
+        switch (region.getRegionData().get(Flag.TNT).getWithDefault()) {
            case ALLOW:
            case ONLY_TB:
-                region.getFlags().set(Flag.TNT, TNTMode.DENY);
+                region.getRegionData().set(Flag.TNT, TNTMode.DENY);
                RegionUtils.actionBar(region, getDisableMessage());
                break;
            case DENY:
-                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
-                    region.getFlags().set(Flag.TNT, TNTMode.ONLY_TB);
+                if (region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                    region.getRegionData().set(Flag.TNT, TNTMode.ONLY_TB);
                    RegionUtils.actionBar(region, getTestblockEnableMessage());
                } else {
-                    region.getFlags().set(Flag.TNT, TNTMode.ALLOW);
+                    region.getRegionData().set(Flag.TNT, TNTMode.ALLOW);
                    RegionUtils.actionBar(region, getEnableMessage());
                }
                break;
@@ -26,8 +26,10 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -39,11 +41,14 @@ import java.util.List;
@Linked
 public class TNTListener implements Listener, ScoreboardElement {

-    private void explode(List<Block> blockList) {
+    private void explode(List<Block> blockList, boolean destroy) {
        blockList.removeIf(block -> {
            Region region = Region.getRegion(block.getLocation());
-            TNTMode value = region.getFlags().get(Flag.TNT).getWithDefault();
+            TNTMode value = region.getRegionData().get(Flag.TNT).getWithDefault();
            if (value == TNTMode.ALLOW) {
+                if (destroy && block.getType() != Material.TNT) {
+                    block.setType(Material.AIR);
+                }
                return false;
            } else if (value == TNTMode.ONLY_TB) {
                if (region.getBuildArea().inRegion(block.getLocation(), true)) {
@@ -57,12 +62,12 @@ public class TNTListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onBlockExplode(BlockExplodeEvent event) {
-        explode(event.blockList());
+        explode(event.blockList(), false);
    }

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

    @Override
@@ -77,7 +82,7 @@ public class TNTListener implements Listener, ScoreboardElement {

    @Override
    public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.TNT).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.TNT).getWithDefault().getChatValue(), p);
    }
 }
@@ -31,7 +31,6 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
@@ -73,6 +72,14 @@ public class TestblockCommand extends SWCommand {
        resetRegion(p, node, isExtension ? RegionExtensionType.EXTENSION : RegionExtensionType.NORMAL, isIgnoreAir, isOnlyColor, replaceTNT, replaceWater);
    }

+    @Register(value="default")
+    public void setTestblockDefault(Player p) {
+        Region region = regionCheck(p);
+        if (region == null) return;
+        region.getRegionData().setTestblockSchematic(null);
+        resetRegion(p, null, RegionExtensionType.EXTENSION, false, false, false, false);
+    }
+
    private void resetRegion(Player p, SchematicNode node, RegionExtensionType regionExtensionType, boolean ignoreAir, boolean onlyColors, boolean removeTNT, boolean removeWater) {
        Region region = regionCheck(p);
        if (region == null) return;
@@ -93,29 +100,10 @@ public class TestblockCommand extends SWCommand {
            }
        }

-        // Beta Tester enabled
-        switch (BauServer.getInstance().getOwnerID()) {
-            case 245:
-            case 403:
-            case 1898:
-            case 3320:
-            case 4603:
-            case 5262:
-            case 5399:
-            case 6032:
-            case 7862:
-            case 11077:
-            case 11888:
-            case 12258:
-            case 16009:
-                if (node == null) {
-                    node = region.getRegionData().getTestblockSchematic();
-                } else {
-                    region.getRegionData().setTestblockSchematic(node);
-                }
-                break;
-            default:
-                break;
+        if (node == null) {
+            node = region.getRegionData().getTestblockSchematic();
+        } else {
+            region.getRegionData().setTestblockSchematic(node);
        }

        PasteBuilder.ClipboardProvider clipboardProvider;
@@ -131,7 +119,7 @@ public class TestblockCommand extends SWCommand {
                    .onlyColors(onlyColors)
                    .removeTNT(removeTNT)
                    .removeWater(removeWater)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
            region.getTestblockArea().reset(pasteBuilder, regionExtensionType == RegionExtensionType.EXTENSION);
            RegionUtils.message(region, "REGION_TB_DONE");
        } catch (SecurityException e) {
@@ -198,7 +186,7 @@ public class TestblockCommand extends SWCommand {
            @Override
            public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                List<String> stringList = new ArrayList<>(SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s));
-                stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.get(0), s));
+                stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.byId(0), s));
                return stringList;
            }

@@ -206,7 +194,7 @@ public class TestblockCommand extends SWCommand {
            public SchematicNode map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                SchematicNode node = SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
                if (node == null) {
-                    node = SchematicNode.getNodeFromPath(SteamwarUser.get(0), s);
+                    node = SchematicNode.getNodeFromPath(SteamwarUser.byId(0), s);
                }
                return node;
            }
@@ -0,0 +1,64 @@
+/*
+ *   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.bausystem.features.region;
+
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.WaterDestroyMode;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+
+@Linked
+public class WaterDestroyCommand extends SWCommand {
+    public WaterDestroyCommand() {
+        super("waterdestroy");
+    }
+
+    private String getEnableMessage(){
+        return "REGION_WATER_ENABLED";
+    }
+
+    private String getDisableMessage(){
+        return "REGION_WATER_DISABLED";
+    }
+
+    @Register(description = "REGION_WATER_HELP")
+    public void toggleCommand(@Validator Player p) {
+        Region region = Region.getRegion(p.getLocation());
+
+        if (toggle(region)) {
+            RegionUtils.actionBar(region, getEnableMessage());
+        } else {
+            RegionUtils.actionBar(region, getDisableMessage());
+        }
+    }
+
+    private boolean toggle(Region region) {
+        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) {
+            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.ALLOW);
+            return false;
+        } else {
+            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.DENY);
+            return true;
+        }
+    }
+}
@@ -0,0 +1,57 @@
+/*
+ *   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.bausystem.features.region;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.WaterDestroyMode;
+import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockFromToEvent;
+
+@Linked
+public class WaterDestroyListener implements Listener, ScoreboardElement {
+
+    @EventHandler
+    public void onBlockFromTo(BlockFromToEvent event) {
+        if (event.getBlock().getType() == Material.WATER && event.getToBlock().getType() != Material.AIR && Region.getRegion(event.getBlock().getLocation()).getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) event.setCancelled(true);
+    }
+
+    @Override
+    public ScoreboardGroup getGroup() {
+        return ScoreboardGroup.REGION;
+    }
+
+    @Override
+    public int order() {
+        return 5;
+    }
+
+    @Override
+    public String get(Region region, Player p) {
+        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.ALLOW)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.WATER_DESTROY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.WATER_DESTROY).getWithDefault().getChatValue(), p);
+    }
+}
@@ -84,14 +84,14 @@ public class ColorBauGuiItem extends BauGuiItem {
    @Override
    public ItemStack getItem(Player player) {
        Region region = Region.getRegion(player.getLocation());
-        ColorMode mode = region.getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
+        ColorMode mode = region.getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK);
        return new SWItem(mapColor(mode), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack();
    }

    @Override
    public boolean click(ClickType click, Player p) {
        p.closeInventory();
-        ColorMode current = Region.getRegion(p.getLocation()).getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
+        ColorMode current = Region.getRegion(p.getLocation()).getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK);
        List<SWListInv.SWListEntry<ColorMode>> items = new ArrayList<>();
        for (ColorMode value : ColorMode.values()) {
            items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {
@@ -42,10 +42,10 @@ public class FireBauGuiItem extends BauGuiItem {
    @Override
    public ItemStack getItem(Player player) {
        Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.FIRE).isApplicable()) {
+        if (!region.getRegionData().has(Flag.FIRE).isApplicable()) {
            return new SWItem(Material.BARRIER, "").getItemStack();
        }
-        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+        if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
            return new SWItem(Material.FIRE_CHARGE, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_ALLOW", player)).getItemStack();
        } else {
            return new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_DISALLOW", player)).getItemStack();
@@ -42,10 +42,10 @@ public class FreezeBauGuiItem extends BauGuiItem {
    @Override
    public ItemStack getItem(Player player) {
        Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.FREEZE).isApplicable()) {
+        if (!region.getRegionData().has(Flag.FREEZE).isApplicable()) {
            return new SWItem(Material.BARRIER, "").getItemStack();
        }
-        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            return new SWItem(Material.GUNPOWDER, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_ALLOW", player)).getItemStack();
        } else {
            return new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_DISALLOW", player)).getItemStack();
@@ -43,10 +43,10 @@ public class ProtectBauGuiItem extends BauGuiItem {
    @Override
    public ItemStack getItem(Player player) {
        Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
+        if (!region.getRegionData().has(Flag.PROTECT).isApplicable()) {
            return new SWItem(Material.BARRIER, "").getItemStack();
        }
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
            return SWUtils.setCustomModelData(new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_ALLOW", player)), 1).getItemStack();
        } else {
            return SWUtils.setCustomModelData(new SWItem(Material.STONE, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_DISALLOW", player)), 1).getItemStack();
@@ -42,7 +42,7 @@ public class TntBauGuiItem extends BauGuiItem {

    @Override
    public ItemStack getItem(Player player) {
-        switch (Region.getRegion(player.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
+        switch (Region.getRegion(player.getLocation()).getRegionData().get(Flag.TNT).getWithDefault()) {
            case DENY:
                return new SWItem(Material.MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_OFF", player)).getItemStack();
            case ONLY_TB:
@@ -55,7 +55,7 @@ public class TntBauGuiItem extends BauGuiItem {
    @Override
    public boolean click(ClickType click, Player p) {
        if (click == ClickType.LEFT) {
-            switch (Region.getRegion(p.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
+            switch (Region.getRegion(p.getLocation()).getRegionData().get(Flag.TNT).getWithDefault()) {
                case DENY:
                    updateTntMode(TNTMode.ALLOW, p);
                    break;
@@ -38,7 +38,7 @@ public class ScriptHelper {
        BookMeta meta = (BookMeta) itemStack.getItemMeta();
        if(!writeable) {
            meta.setTitle(script.getName());
-            meta.setAuthor(SteamwarUser.get(script.getUserId()).getUserName());
+            meta.setAuthor(SteamwarUser.byId(script.getUserId()).getUserName());
        }
        meta.setPages(getScriptPages(script));
        itemStack.setItemMeta(meta);
@@ -67,7 +67,7 @@ public class ScriptListener implements Listener {

    @EventHandler
    public void onPlayerQuit(PlayerQuitEvent event) {
-        ScriptRunner.remove(event.getPlayer());
+        playerSet.remove(event.getPlayer());
    }

    @EventHandler
@@ -23,8 +23,11 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.lua.CommandRegister;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.SteamWarPlatform;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.sql.Script;
 import de.steamwar.sql.SteamwarUser;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
@@ -44,12 +47,25 @@ public class ScriptRunner {
    // Key   -> bau-script-<BUCH NAME>
    // Value -> <LUA Script>

-    private static final Map<Player, Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>>> EVENT_MAP = new HashMap<>();
-    private static final Map<Player, Map<Hotkey, List<LuaFunction>>> HOTKEY_MAP = new HashMap<>();
-    private static final Map<Player, Map<String, CommandRegister>> COMMAND_MAP = new HashMap<>();
+    public class ScriptData implements SWPlayer.Component {
+        private Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>> events = new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class);
+        private Map<Hotkey, List<LuaFunction>> hotkeys = new HashMap<>();
+        private Map<String, CommandRegister> commands = new HashMap<>();
+
+        @Getter
+        private Set<String> calledCommands = new HashSet<>();
+
+        @Getter
+        @Setter
+        private Long lastF = Long.MAX_VALUE;
+
+        @Getter
+        @Setter
+        private boolean ignore;
+    }

    public Set<String> getCommandsOfPlayer(Player player) {
-        return COMMAND_MAP.getOrDefault(player, new HashMap<>()).keySet();
+        return SWPlayer.of(player).getComponentOrDefault(ScriptData.class, ScriptData::new).commands.keySet();
    }

    public static void runScript(String script, Player player) {
@@ -64,10 +80,12 @@ public class ScriptRunner {

    public static void createGlobalScript(List<String> scripts, Player player) {
        remove(player);
+        SWPlayer swPlayer = SWPlayer.of(player);
+        ScriptData scriptData = swPlayer.getComponentOrDefault(ScriptData.class, ScriptData::new);
        Globals globals = SteamWarPlatform.createGlobalGlobals(player,
-                (s, luaFunction) -> EVENT_MAP.computeIfAbsent(player, player1 -> new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class)).computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
-                (s, luaFunction) -> HOTKEY_MAP.computeIfAbsent(player, player1 -> new HashMap<>()).computeIfAbsent(Hotkey.fromString(s), s1 -> new ArrayList<>()).add(luaFunction),
-                commandRegister -> COMMAND_MAP.computeIfAbsent(player, player1 -> new HashMap<>()).put(commandRegister.getName(), commandRegister));
+                (s, luaFunction) -> scriptData.events.computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
+                (s, luaFunction) -> scriptData.hotkeys.computeIfAbsent(Hotkey.fromString(s), s1 -> new ArrayList<>()).add(luaFunction),
+                commandRegister -> scriptData.commands.put(commandRegister.getName(), commandRegister));

        for (String script : scripts) {
            catchScript("SCRIPT_ERROR_GLOBAL", player, () -> globals.load(script).call());
@@ -75,13 +93,14 @@ public class ScriptRunner {
    }

    public static void remove(Player player) {
-        EVENT_MAP.remove(player);
-        COMMAND_MAP.remove(player);
-        HOTKEY_MAP.remove(player);
+        SWPlayer.of(player).removeComponent(ScriptData.class);
    }

    public static void callEvent(Player player, SteamWarGlobalLuaPlugin.EventType event, LuaValue eventValue, Event wrappedEvent) {
-        List<LuaFunction> luaFunctions = EVENT_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(event, Collections.emptyList());
+        List<LuaFunction> luaFunctions = SWPlayer.of(player).getComponent(ScriptData.class)
+                .map(scriptData -> scriptData.events)
+                .orElse(Collections.emptyMap())
+                .getOrDefault(event, Collections.emptyList());
        if (luaFunctions.isEmpty()) {
            if(event == SteamWarGlobalLuaPlugin.EventType.DoubleSwap) {
                player.performCommand("gui");
@@ -124,7 +143,10 @@ public class ScriptRunner {
    }

    public static boolean callCommand(Player player, String command, String[] argsArray) {
-        CommandRegister commandRegister = COMMAND_MAP.getOrDefault(player, Collections.emptyMap()).get(command);
+        CommandRegister commandRegister = SWPlayer.of(player).getComponent(ScriptData.class)
+                .map(scriptData -> scriptData.commands)
+                .orElse(Collections.emptyMap())
+                .get(command);
        if (commandRegister == null) {
            return false;
        }
@@ -188,7 +210,11 @@ public class ScriptRunner {

    public static void callHotkey(int mods, int key, Player player, boolean pressed) {
        Hotkey hotkey = Hotkey.fromChar(key, mods);
-        catchScript("SCRIPT_ERROR_GLOBAL", player, () -> HOTKEY_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(hotkey, Collections.emptyList()).forEach(luaFunction -> luaFunction.call(LuaValue.valueOf(pressed))));
+        List<LuaFunction> hotkeys = SWPlayer.of(player).getComponent(ScriptData.class)
+                .map(scriptData -> scriptData.hotkeys)
+                .orElse(Collections.emptyMap())
+                .getOrDefault(hotkey, Collections.emptyList());
+        catchScript("SCRIPT_ERROR_GLOBAL", player, () -> hotkeys.forEach(luaFunction -> luaFunction.call(LuaValue.valueOf(pressed))));
    }

    public static void catchScript(String errorMsg, Player player, Runnable run) {
@@ -21,44 +21,24 @@ package de.steamwar.bausystem.features.script.event;

 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;

@Linked
 public class CommandListener implements Listener {

-    private Map<Player, Set<String>> calledCommands = new HashMap<>();
-
    @EventHandler
    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
        String[] split = event.getMessage().split(" ");
-        if (calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).contains(split[0])) {
-            return;
-        }
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.getCalledCommands().contains(split[0])) return;

-        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).add(split[0]);
+        scriptData.getCalledCommands().add(split[0]);
        event.setCancelled(ScriptRunner.callCommand(event.getPlayer(), split[0].substring(1), split));
-        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).remove(split[0]);
-    }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        calledCommands.put(event.getPlayer(), new HashSet<>());
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        calledCommands.remove(event.getPlayer());
+        scriptData.getCalledCommands().remove(split[0]);
    }
 }
@@ -25,6 +25,7 @@ import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
@@ -43,32 +44,27 @@ import org.bukkit.event.player.*;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;

-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
@Linked
 public class EventListener implements Listener {

-    private static final Map<Player, Long> LAST_FS = new HashMap<>();
-
    static {
        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
            long millis = System.currentTimeMillis();
-            LAST_FS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
+            SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
+                    .filter(pair -> millis - pair.getComponent().getLastF() > 200)
+                    .forEach(pair -> pair.getComponent().setLastF(Long.MAX_VALUE));
        }, 1, 1);
    }

    @EventHandler(priority = EventPriority.MONITOR)
    public void onPlayerJoin(PlayerJoinEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfJoin, LuaValue.NIL, event);
    }

    @EventHandler(priority = EventPriority.HIGH)
    public void onPlayerQuit(PlayerQuitEvent event) {
-        if(Permission.BUILD.hasPermission(event.getPlayer())) {
+        if (Permission.BUILD.hasPermission(event.getPlayer())) {
            ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfLeave, LuaValue.NIL, event);
        }
        StorageLib.removePlayer(event.getPlayer());
@@ -76,19 +72,20 @@ public class EventListener implements Listener {

    @EventHandler(priority = EventPriority.HIGH)
    public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (LAST_FS.containsKey(event.getPlayer())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.getLastF() != Long.MAX_VALUE) {
            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DoubleSwap, LuaValue.NIL, event);
            }, 1);
        } else {
-            LAST_FS.put(event.getPlayer(), System.currentTimeMillis());
+            scriptData.setLastF(System.currentTimeMillis());
        }
    }

    @EventHandler(priority = EventPriority.HIGH)
    public void onBlockPlace(BlockPlaceEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        LuaTable table = new LuaTable();
        table.set("x", event.getBlock().getX());
        table.set("y", event.getBlock().getY());
@@ -99,7 +96,7 @@ public class EventListener implements Listener {

    @EventHandler(priority = EventPriority.HIGH)
    public void onBlockBreak(BlockBreakEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        LuaTable table = new LuaTable();
        table.set("x", event.getBlock().getX());
        table.set("y", event.getBlock().getY());
@@ -108,12 +105,12 @@ public class EventListener implements Listener {
        ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.BreakBlock, table, event);
    }

-    private final Set<Player> ignore = new HashSet<>();
-
    @EventHandler(priority = EventPriority.LOW)
    public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (ignore.remove(event.getPlayer())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.isIgnore()) {
+            scriptData.setIgnore(false);
            return;
        }
        LuaTable table = new LuaTable();
@@ -124,7 +121,7 @@ public class EventListener implements Listener {
            table.set("hand", event.getHand().name());
        }
        table.set("block", event.getItem() == null ? Material.AIR.name() : event.getItem().getType().name());
-        if(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK) {
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK) {
            table.set("hasBlock", LuaValue.valueOf(true));
            table.set("blockX", event.getClickedBlock().getX());
            table.set("blockY", event.getClickedBlock().getY());
@@ -150,7 +147,7 @@ public class EventListener implements Listener {
        Region tntRegion = Region.getRegion(event.getLocation());

        for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
+            if (!Permission.BUILD.hasPermission(player)) continue;
            if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTSpawn, LuaValue.NIL, event);
            }
@@ -172,7 +169,7 @@ public class EventListener implements Listener {
        boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.getBuildArea().inRegion(block.getLocation(), true));

        for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
+            if (!Permission.BUILD.hasPermission(player)) continue;
            if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplode, table, event);
                if (inBuild) {
@@ -184,8 +181,9 @@ public class EventListener implements Listener {

    @EventHandler(priority = EventPriority.HIGH)
    public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ignore.add(event.getPlayer());
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        scriptData.setIgnore(true);
        LuaTable table = new LuaTable();
        table.set("type", event.getItemDrop().getItemStack().getType().name());
        ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DropItem, table, event);
@@ -194,7 +192,7 @@ public class EventListener implements Listener {
    @EventHandler(priority = EventPriority.HIGH)
    public void onEntityDeath(EntityDeathEvent event) {
        for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
+            if (!Permission.BUILD.hasPermission(player)) continue;
            LuaTable table = new LuaTable();
            table.set("type", event.getEntityType().name());
            ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.EntityDeath, table, event);
@@ -48,6 +48,7 @@ import java.util.logging.Level;
 public class SteamWarLuaPlugin extends TwoArgFunction {

    private static final boolean hasFAWE = Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null;
+    private static final Set<String> ignoreCommandFromWorldEdit = Set.of("select", "schem", "/schem", "schematic", "/schematic");

    protected static final Map<Class<?>, List<LuaLib>> LUA_LIBS = new HashMap<>();

@@ -116,7 +117,7 @@ public class SteamWarLuaPlugin extends TwoArgFunction {
                command = preprocessEvent.getMessage().substring(1);
                Bukkit.getLogger().log(Level.INFO, player.getName() + " dispatched command: " + command);
                String[] commandSplit = command.split(" ");
-                if (!commandSplit[0].equals("select") && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
+                if (!ignoreCommandFromWorldEdit.contains(commandSplit[0]) && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
                    EditSession editSession = WorldEditUtils.getEditSession(player);
                    Actor actor = BukkitAdapter.adapt(player);
                    WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().handleCommandOnCurrentThread(new CommandEvent(actor, command, editSession));
@@ -59,14 +59,14 @@ public class RegionLib implements LuaLib {
        }));

        LuaValue tntLib = LuaValue.tableOf();
-        tntLib.set("mode", getter(() -> region.get().getFlags().get(Flag.TNT).nameWithDefault()));
-        tntLib.set("enabled", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) != TNTMode.DENY));
-        tntLib.set("onlyTb", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
+        tntLib.set("mode", getter(() -> region.get().getRegionData().get(Flag.TNT).nameWithDefault()));
+        tntLib.set("enabled", getter(() -> region.get().getRegionData().get(Flag.TNT).orElse(null) != TNTMode.DENY));
+        tntLib.set("onlyTb", getter(() -> region.get().getRegionData().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
        table.set("tnt", tntLib);

-        table.set("fire", getter(() -> region.get().getFlags().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
-        table.set("freeze", getter(() -> region.get().getFlags().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
-        table.set("protect", getter(() -> region.get().getFlags().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));
+        table.set("fire", getter(() -> region.get().getRegionData().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
+        table.set("freeze", getter(() -> region.get().getRegionData().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
+        table.set("protect", getter(() -> region.get().getRegionData().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));

        //LuaValue traceLib = LuaValue.tableOf();
        //traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));
@@ -89,7 +89,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
                jsonObject.keySet().forEach(key -> {
                    map.put(key, fromJson(jsonObject.get(key)));
                });
-                SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(playerStorage.getName().substring(0, playerStorage.getName().length() - ".json".length())));
+                SteamwarUser steamwarUser = SteamwarUser.byId(Integer.parseInt(playerStorage.getName().substring(0, playerStorage.getName().length() - ".json".length())));
                PLAYER_STORAGE.put(steamwarUser.getUUID(), map);
            } catch (Exception e) {}
        }
@@ -1,18 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
 *
- * Copyright (C) 2025 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 the Free Software Foundation, either version 3
- * of the License, or (at your option) any later version.
+ *   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.
+ *   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/>.
+ *   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.simulator;
@@ -20,9 +22,7 @@ package de.steamwar.bausystem.features.simulator;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.display.SimulatorCursor;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
-import de.steamwar.bausystem.features.simulator.SimulatorCursorManager;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -40,7 +40,7 @@ import java.util.Collection;
 public class SimulatorCommand extends SWCommand {

    @LinkedInstance
-    public SimulatorCursorManager cursorManager;
+    public SimulatorCursor simulatorCursor;

    public SimulatorCommand() {
        super("sim", "simulator");
@@ -49,12 +49,12 @@ public class SimulatorCommand extends SWCommand {
    @Register(description = "SIMULATOR_HELP")
    public void genericCommand(@Validator Player p) {
        SWUtils.giveItemToPlayer(p, SimulatorStorage.getWand(p));
-        cursorManager.showCursor(p, null);
+        simulatorCursor.calcCursor(p);
    }

    @Register(value = "change", description = "SIMULATOR_CHANGE_HELP")
    public void change(@Validator Player p) {
-        if (!SimulatorUtils.isSimulatorItem(p.getInventory().getItemInMainHand()) && !SimulatorUtils.isSimulatorItem(p.getInventory().getItemInOffHand())) {
+        if (!SimulatorCursor.isSimulatorItem(p.getInventory().getItemInMainHand()) && !SimulatorCursor.isSimulatorItem(p.getInventory().getItemInOffHand())) {
            BauSystem.MESSAGE.send("SIMULATOR_NO_SIM_IN_HAND", p);
            return;
        }
@@ -0,0 +1,469 @@
+/*
+ *   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.bausystem.features.simulator;
+
+import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
+import de.steamwar.bausystem.SWUtils;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
+import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
+import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
+import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
+import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
+import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui;
+import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
+import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.bausystem.utils.ItemUtils;
+import de.steamwar.bausystem.utils.RayTraceUtils;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
+import de.steamwar.inventory.SWAnvilInv;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.*;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Linked
+@MinVersion(19)
+public class SimulatorCursor implements Listener {
+
+    private static final World WORLD = Bukkit.getWorlds().get(0);
+
+    private static Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
+    private static Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
+    private static final Set<Player> calculating = new HashSet<>();
+
+    public static boolean isSimulatorItem(ItemStack itemStack) {
+        return ItemUtils.isItem(itemStack, "simulator");
+    }
+
+    public SimulatorCursor() {
+        BiFunction<Player, Object, Object> function = (player, object) -> {
+            calcCursor(player);
+            return object;
+        };
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, function);
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Rot.class, function);
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, function);
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            calcCursor(event.getPlayer());
+        }, 0);
+    }
+
+    @EventHandler
+    public void onPlayerDropItem(PlayerDropItemEvent event) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        calcCursor(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onPlayerItemHeld(PlayerItemHeldEvent event) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            calcCursor(event.getPlayer());
+        }, 1);
+    }
+
+    @EventHandler
+    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+        event.getChanged().forEach(SimulatorCursor::calcCursor);
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        cursorType.remove(event.getPlayer());
+        cursors.remove(event.getPlayer());
+        synchronized (calculating) {
+            calculating.remove(event.getPlayer());
+        }
+    }
+
+    private static final Map<Player, Long> LAST_SNEAKS = new HashMap<>();
+
+    static {
+        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
+            long millis = System.currentTimeMillis();
+            LAST_SNEAKS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
+        }, 1, 1);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
+        if (!event.isSneaking()) return;
+        Player player = event.getPlayer();
+        if (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand())) {
+            return;
+        }
+        if (LAST_SNEAKS.containsKey(player)) {
+            CursorType currentType = cursorType.getOrDefault(player, CursorType.TNT);
+            if (currentType == CursorType.TNT) {
+                cursorType.put(player, CursorType.REDSTONE_BLOCK);
+            } else {
+                cursorType.put(player, CursorType.TNT);
+            }
+            calcCursor(player);
+        } else {
+            LAST_SNEAKS.put(player, System.currentTimeMillis());
+        }
+    }
+
+    public static CursorType getCursorType(Player player) {
+        return cursorType.getOrDefault(player, CursorType.TNT);
+    }
+
+    public static void setCursorType(Player player, CursorType cursorType) {
+        SimulatorCursor.cursorType.put(player, cursorType);
+        calcCursor(player);
+    }
+
+    public static void calcCursor(Player player) {
+        synchronized (calculating) {
+            if (calculating.contains(player)) return;
+            calculating.add(player);
+        }
+        if (!Permission.BUILD.hasPermission(player) || (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand()))) {
+            if (removeCursor(player) || SimulatorWatcher.show(null, player)) {
+                SWUtils.sendToActionbar(player, "");
+            }
+            synchronized (calculating) {
+                calculating.remove(player);
+            }
+            return;
+        }
+
+        Simulator simulator = SimulatorStorage.getSimulator(player);
+        if (simulator != null && simulator.getStabGenerator() != null) {
+            removeCursor(player);
+            SimulatorWatcher.show(null, player);
+            SWUtils.sendToActionbar(player, "§cGenerating Stab");
+            synchronized (calculating) {
+                calculating.remove(player);
+            }
+            return;
+        }
+
+        SimulatorWatcher.show(simulator, player);
+        List<REntity> entities = SimulatorWatcher.getEntitiesOfSimulator(simulator);
+        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), entities);
+        if (rayTraceResult == null) {
+            removeCursor(player);
+            if (simulator == null) {
+                SWUtils.sendToActionbar(player, "§eSelect Simulator");
+            } else {
+                SWUtils.sendToActionbar(player, "§eOpen Simulator");
+            }
+            synchronized (calculating) {
+                calculating.remove(player);
+            }
+            return;
+        }
+
+        showCursor(player, rayTraceResult, simulator != null);
+        synchronized (calculating) {
+            calculating.remove(player);
+        }
+    }
+
+    private static synchronized boolean removeCursor(Player player) {
+        REntityServer entityServer = cursors.get(player);
+        boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
+        if (entityServer != null) {
+            entityServer.getEntities().forEach(REntity::die);
+        }
+        return hadCursor;
+    }
+
+    private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
+        REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
+            REntityServer rEntityServer = new REntityServer();
+            rEntityServer.addPlayer(player);
+            return rEntityServer;
+        });
+
+        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
+        REntity hitEntity = rayTraceResult.getHitEntity();
+        Location location = hitEntity != null ? new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()).toLocation(WORLD) :
+                type.position.apply(player, rayTraceResult).toLocation(WORLD);
+
+        Material material = hitEntity != null ? Material.GLASS : type.getMaterial();
+        List<RFallingBlockEntity> entities = entityServer.getEntitiesByType(RFallingBlockEntity.class);
+        entities.removeIf(rFallingBlockEntity -> {
+            if (rFallingBlockEntity.getMaterial() != material) {
+                rFallingBlockEntity.die();
+                return true;
+            }
+            rFallingBlockEntity.move(location);
+            return false;
+        });
+        if (entities.isEmpty()) {
+            RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(entityServer, location, material);
+            rFallingBlockEntity.setNoGravity(true);
+            if (material == Material.GLASS) {
+                rFallingBlockEntity.setGlowing(true);
+            }
+        }
+
+        if (hasSimulatorSelected) {
+            if (hitEntity != null) {
+                SWUtils.sendToActionbar(player, "§eEdit Position");
+            } else {
+                SWUtils.sendToActionbar(player, "§eAdd new " + type.name);
+            }
+        } else {
+            SWUtils.sendToActionbar(player, "§eCreate new Simulator");
+        }
+    }
+
+    public static Vector getPosFree(Player player, RayTraceUtils.RRayTraceResult result) {
+        Vector pos = result.getHitPosition();
+
+        BlockFace face = result.getHitBlockFace();
+        if (face != null) {
+            switch (face) {
+                case DOWN:
+                    pos.setY(pos.getY() - 0.98);
+                    break;
+                case EAST:
+                    pos.setX(pos.getX() + 0.49);
+                    break;
+                case WEST:
+                    pos.setX(pos.getX() - 0.49);
+                    break;
+                case NORTH:
+                    pos.setZ(pos.getZ() - 0.49);
+                    break;
+                case SOUTH:
+                    pos.setZ(pos.getZ() + 0.49);
+                    break;
+                default:
+                    break;
+            }
+
+            if (face.getModY() == 0 && player.isSneaking()) {
+                pos.setY(pos.getY() - 0.49);
+            }
+        }
+
+        if (!player.isSneaking()) {
+            pos.setX(pos.getBlockX() + 0.5);
+            if (face == null || face.getModY() == 0)
+                pos.setY(pos.getBlockY() + 0.0);
+            pos.setZ(pos.getBlockZ() + 0.5);
+        }
+
+        return pos;
+    }
+
+    private static Vector getPosBlockAligned(Player player, RayTraceUtils.RRayTraceResult result) {
+        Vector pos = result.getHitPosition();
+
+        BlockFace face = result.getHitBlockFace();
+        if (face != null) {
+            switch (face) {
+                case DOWN:
+                    pos.setY(pos.getY() - 0.98);
+                    break;
+                case EAST:
+                    pos.setX(pos.getX() + 0.49);
+                    break;
+                case WEST:
+                    pos.setX(pos.getX() - 0.49);
+                    break;
+                case NORTH:
+                    pos.setZ(pos.getZ() - 0.49);
+                    break;
+                case SOUTH:
+                    pos.setZ(pos.getZ() + 0.49);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        pos.setX(pos.getBlockX() + 0.5);
+        if (pos.getY() - pos.getBlockY() != 0 && face == BlockFace.UP) {
+            pos.setY(pos.getBlockY() + 1.0);
+        } else {
+            pos.setY(pos.getBlockY());
+        }
+        pos.setZ(pos.getBlockZ() + 0.5);
+        return pos;
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum CursorType {
+        TNT(Material.TNT, Material.GUNPOWDER, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
+        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
+        OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
+        ;
+
+        public final Material material;
+        public final Material nonSelectedMaterial;
+        public final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
+        public final String name;
+        public final Function<Vector, SimulatorElement<?>> elementFunction;
+    }
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!ItemUtils.isItem(event.getItem(), "simulator")) {
+            return;
+        }
+
+        event.setCancelled(true);
+        Player player = event.getPlayer();
+        Simulator simulator = SimulatorStorage.getSimulator(player);
+
+        if (event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_AIR) {
+            if (simulator == null) {
+                return;
+            }
+            SimulatorExecutor.run(event.getPlayer(), simulator, null);
+            return;
+        }
+
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
+            return;
+        }
+
+
+        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), SimulatorWatcher.getEntitiesOfSimulator(simulator));
+        if (simulator == null) {
+            if (rayTraceResult == null) {
+                SimulatorStorage.openSimulatorSelector(player);
+            } else {
+                SWAnvilInv anvilInv = new SWAnvilInv(player, "Name");
+                anvilInv.setCallback(s -> {
+                    Simulator sim = SimulatorStorage.getSimulator(s);
+                    if (sim != null) {
+                        BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", player);
+                        return;
+                    }
+                    if (!s.matches("[a-zA-Z_0-9-]+")) {
+                        BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", player);
+                        return;
+                    }
+                    sim = new Simulator(s);
+                    SimulatorStorage.addSimulator(s, sim);
+                    createElement(player, rayTraceResult, sim);
+                    SimulatorStorage.setSimulator(player, sim);
+                });
+                anvilInv.open();
+            }
+            return;
+        }
+
+        if (rayTraceResult == null) {
+            new SimulatorGui(player, simulator).open();
+            return;
+        }
+
+        if (rayTraceResult.getHitEntity() != null) {
+            REntity hitEntity = rayTraceResult.getHitEntity();
+            Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
+            List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
+                return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
+            }).collect(Collectors.toList());
+
+            switch (elements.size()) {
+                case 0:
+                    return;
+                case 1:
+                    // Open single element present in Simulator
+                    SimulatorElement<?> element = elements.get(0);
+                    SimulatorGroup group1 = element.getGroup(simulator);
+                    SimulatorBaseGui back = new SimulatorGui(player, simulator);
+                    if (group1.getElements().size() > 1) {
+                        back = new SimulatorGroupGui(player, simulator, group1, back);
+                    }
+                    element.open(player, simulator, group1, back);
+                    break;
+                default:
+                    List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
+                    if (parents.size() == 1) {
+                        // Open multi element present in Simulator in existing group
+                        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+                        new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
+                    } else {
+                        // Open multi element present in Simulator in implicit group
+                        SimulatorGroup group2 = new SimulatorGroup();
+                        group2.setMaterial(null);
+                        group2.getElements().addAll(elements);
+                        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+                        new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
+                    }
+                    break;
+            }
+            return;
+        }
+
+        // Add new Element to current simulator
+        createElement(player, rayTraceResult, simulator);
+    }
+
+    private void createElement(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, Simulator simulator) {
+        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
+        Vector vector = type.position.apply(player, rayTraceResult);
+        if (type == CursorType.REDSTONE_BLOCK) {
+            vector.subtract(new Vector(0.5, 0, 0.5));
+        }
+        SimulatorElement<?> element = type.elementFunction.apply(vector);
+        SimulatorGroup group = new SimulatorGroup().add(element);
+        simulator.getGroups().add(group);
+        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+        element.open(player, simulator, group, simulatorGui);
+        SimulatorWatcher.update(simulator);
+        calcCursor(player);
+    }
+}
@@ -1,103 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2023 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.simulator;
-
-
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.display.ASimulatorCursor;
-import de.steamwar.bausystem.features.simulator.display.EmptySimulatorCursor;
-import de.steamwar.bausystem.features.simulator.display.SimulatorCursor;
-import de.steamwar.bausystem.features.simulator.display.SimulatorCursorMode;
-
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-
-import org.bukkit.event.Listener;
-
-import org.bukkit.event.player.*;
-import org.bukkit.inventory.ItemStack;
-import java.util.*;
-
-// TODO fix memory leak when players leave the server
-// TODO fix cursor not being hidden when player deequips simulator item
-
-@Linked
-@MinVersion(19)
-public class SimulatorCursorManager implements Listener {
-    public static final SimulatorCursorManager INSTANCE = new SimulatorCursorManager();
-
-    private final Map<Player, Map<Simulator, ASimulatorCursor>> openCursorsByPlayerBySimulator = new HashMap<>();
-    private final Map<Player, ASimulatorCursor> activeCursorByPlayer = new HashMap<>();
-
-    @EventHandler
-    public void onPlayerItemEquip(PlayerItemHeldEvent event) {
-        ItemStack newItem = event.getPlayer().getInventory().getItem(event.getNewSlot());
-        if (SimulatorUtils.isSimulatorItem(newItem)) {
-            Simulator simulator = SimulatorStorage.getSimulator(newItem);
-            showCursor(event.getPlayer(), simulator);
-        }
-    }
-
-    /**
-     * Shows the cursor for the given simulator to the given player. Shows an empty cursor if the
-     * simulator is null.
-     */
-    public void showCursor(Player player, Simulator simulator) {
-        var currentActiveCursor = activeCursorByPlayer.get(player);
-        if (currentActiveCursor != null) {
-            currentActiveCursor.hide();
-        }
-
-        var cursorMode = currentActiveCursor != null ? currentActiveCursor.getCursorMode() : SimulatorCursorMode.TNT;
-
-        var cursorsBySimulator = openCursorsByPlayerBySimulator.computeIfAbsent(player, __ -> new HashMap<>());
-        var cursor = cursorsBySimulator.get(simulator);
-        if (cursor == null) {
-            if (simulator == null) {
-                ASimulatorCursor emptyCursor = new EmptySimulatorCursor(player, cursorMode);
-                cursorsBySimulator.put(simulator, emptyCursor);
-                cursor = emptyCursor;
-            } else {
-                ASimulatorCursor newCursor = new SimulatorCursor(simulator, player, cursorMode);
-                cursorsBySimulator.put(simulator, newCursor);
-                cursor = newCursor;
-            }
-        }
-
-        cursor.show();
-    }
-
-    public Optional<SimulatorCursorMode> getActiveCursorMode(Player player) {
-        var currentActiveCursor = activeCursorByPlayer.get(player);
-        if (currentActiveCursor != null) {
-            return Optional.of(currentActiveCursor.getCursorMode());
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    public void setActiveCursorMode(Player player, SimulatorCursorMode mode) {
-        var currentActiveCursor = activeCursorByPlayer.get(player);
-        if (currentActiveCursor != null) {
-            currentActiveCursor.setCursorMode(mode);
-        }
-    }
-}
@@ -1,18 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
 *
- * Copyright (C) 2025 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 the Free Software Foundation, either version 3
- * of the License, or (at your option) any later version.
+ *   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.
+ *   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/>.
+ *   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.simulator;
@@ -54,13 +56,12 @@ public class SimulatorStorage implements Enable {

    public static Simulator getSimulator(Player player) {
        Simulator simulator = getSimulator(player.getInventory().getItemInMainHand());
-        if (simulator != null)
-            return simulator;
+        if (simulator != null) return simulator;
        return getSimulator(player.getInventory().getItemInOffHand());
    }

    public static Simulator getSimulator(ItemStack itemStack) {
-        if (!SimulatorUtils.isSimulatorItem(itemStack)) {
+        if (!SimulatorCursor.isSimulatorItem(itemStack)) {
            return null;
        }
        String selection = ItemUtils.getTag(itemStack, simulatorSelection);
@@ -85,11 +86,11 @@ public class SimulatorStorage implements Enable {
        YAPIONFormatSimulatorLoader yapionFormatSimulatorLoader = new YAPIONFormatSimulatorLoader();

        File[] files = simulatorsDir.listFiles();
-        if (files == null)
-            return;
+        if (files == null) return;
        for (File file : files) {
            try {
-                List<Simulator> simulators = simFormatSimulatorLoader.load(file).orElse(null);
+                List<Simulator> simulators = simFormatSimulatorLoader.load(file)
+                        .orElse(null);
                if (simulators != null) {
                    simulators.forEach(simulator -> {
                        simulatorMap.put(simulator.getName(), simulator);
@@ -101,7 +102,8 @@ public class SimulatorStorage implements Enable {
            }

            try {
-                List<Simulator> simulators = simulatorFormatSimulatorLoader.load(file).orElse(null);
+                List<Simulator> simulators = simulatorFormatSimulatorLoader.load(file)
+                        .orElse(null);
                if (simulators != null) {
                    simulators.forEach(simulator -> {
                        simulatorMap.put(simulator.getName(), simulator);
@@ -114,7 +116,8 @@ public class SimulatorStorage implements Enable {
            }

            try {
-                List<Simulator> simulators = yapionFormatSimulatorLoader.load(file).orElse(null);
+                List<Simulator> simulators = yapionFormatSimulatorLoader.load(file)
+                        .orElse(null);
                if (simulators != null) {
                    simulators.forEach(simulator -> {
                        simulatorMap.put(simulator.getName(), simulator);
@@ -128,8 +131,7 @@ public class SimulatorStorage implements Enable {
    }

    public static void openSimulatorSelector(Player player) {
-        SimulatorPageGui<Simulator> simulatorPageGui = new SimulatorPageGui<Simulator>(player, null, 6 * 9,
-                simulatorMap.values().stream().sorted(Comparator.comparing(Simulator::getName)).collect(Collectors.toList())) {
+        SimulatorPageGui<Simulator> simulatorPageGui = new SimulatorPageGui<Simulator>(player, null, 6 * 9, simulatorMap.values().stream().sorted(Comparator.comparing(Simulator::getName)).collect(Collectors.toList())) {
            @Override
            public String baseTitle() {
                return "Simulators";
@@ -169,11 +171,7 @@ public class SimulatorStorage implements Enable {
    }

    public static ItemStack getWand(Player p) {
-        ItemStack itemStack = new SWItem(Material.BLAZE_ROD, BauSystem.MESSAGE.parse("SIMULATOR_WAND_NAME", p),
-                Arrays.asList(BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_1", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_2", p),
-                        BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_3", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_4", p),
-                        BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_5", p)),
-                false, null).getItemStack();
+        ItemStack itemStack = new SWItem(Material.BLAZE_ROD, BauSystem.MESSAGE.parse("SIMULATOR_WAND_NAME", p), Arrays.asList(BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_1", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_2", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_3", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_4", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_5", p)), false, null).getItemStack();
        ItemMeta itemMeta = itemStack.getItemMeta();
        itemMeta.setCustomModelData(1);
        itemStack.setItemMeta(itemMeta);
@@ -185,9 +183,9 @@ public class SimulatorStorage implements Enable {
        ItemStack mainHand = player.getInventory().getItemInMainHand();
        ItemStack offHand = player.getInventory().getItemInOffHand();
        ItemStack itemStack;
-        if (SimulatorUtils.isSimulatorItem(mainHand)) {
+        if (SimulatorCursor.isSimulatorItem(mainHand)) {
            itemStack = mainHand;
-        } else if (SimulatorUtils.isSimulatorItem(offHand)) {
+        } else if (SimulatorCursor.isSimulatorItem(offHand)) {
            itemStack = offHand;
        } else {
            itemStack = null;
@@ -1,12 +0,0 @@
-package de.steamwar.bausystem.features.simulator;
-
-import org.bukkit.inventory.ItemStack;
-import de.steamwar.bausystem.utils.ItemUtils;
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class SimulatorUtils {
-  public static boolean isSimulatorItem(ItemStack itemStack) {
-    return ItemUtils.isItem(itemStack, "simulator");
-  }
-}
@@ -0,0 +1,129 @@
+/*
+ *   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.bausystem.features.simulator;
+
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
+import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.storage.SimulatorSaver;
+import de.steamwar.bausystem.shared.Pair;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+@UtilityClass
+public class SimulatorWatcher {
+
+    private final World WORLD = Bukkit.getWorlds().get(0);
+    private Map<Simulator, REntityServer> entityServers = new HashMap<>();
+    private Map<Player, Pair<Simulator, Runnable>> watchers = new HashMap<>();
+
+    public void watch(Player player, Simulator simulator, Runnable watcher) {
+        if (simulator == null || watcher == null) {
+            watchers.remove(player);
+        } else {
+            watchers.put(player, new Pair<>(simulator, watcher));
+        }
+    }
+
+    public synchronized void update(Simulator simulator) {
+        REntityServer rEntityServer = entityServers.get(simulator);
+        if (rEntityServer != null) {
+            rEntityServer.getEntities().forEach(REntity::die);
+            createSim(rEntityServer, simulator);
+        }
+
+        new ArrayList<>(watchers.values()).forEach(simulatorRunnablePair -> {
+            if (simulatorRunnablePair.getKey() == simulator) {
+                simulatorRunnablePair.getValue().run();
+            }
+        });
+        SimulatorSaver.saveSimulator(SimulatorStorage.simulatorsDir, simulator);
+    }
+
+    @Linked
+    @MinVersion(19)
+    public static class QuitListener implements Listener {
+
+        @EventHandler
+        public void onPlayerQuit(PlayerQuitEvent event) {
+            watchers.remove(event.getPlayer());
+            show(null, event.getPlayer());
+        }
+    }
+
+    private REntityServer createSim(REntityServer server, Simulator simulator) {
+        if (simulator == null) {
+            return null;
+        }
+        Map<Vector, Set<Class<?>>> positionCache = new HashMap<>();
+        simulator.getGroups().stream().map(group -> group.getElements().stream().map(element -> new Pair<>(group, element)).collect(Collectors.toList())).flatMap(List::stream).forEach(pair -> {
+            SimulatorGroup group = pair.getKey();
+            SimulatorElement<?> element = pair.getValue();
+
+            boolean wasNotPresent = positionCache.computeIfAbsent(element.getPosition(), __ -> new HashSet<>())
+                    .add(element.getClass());
+            if (!wasNotPresent) return;
+            Material material = group.isDisabled() || element.isDisabled() ? element.getWorldDisabledMaterial() : element.getWorldMaterial();
+            Location location = element.getWorldPos().toLocation(WORLD);
+            RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(server, location, material);
+            rFallingBlockEntity.setNoGravity(true);
+        });
+        return server;
+    }
+
+    public synchronized boolean show(Simulator sim, Player player) {
+        AtomicBoolean removed = new AtomicBoolean();
+        entityServers.forEach((simulator, rEntityServer) -> {
+            if (rEntityServer == null) return;
+            if (rEntityServer.getPlayers().contains(player) && sim != simulator) {
+                rEntityServer.removePlayer(player);
+                removed.set(true);
+            }
+        });
+        if (sim == null) return removed.get();
+        entityServers.computeIfAbsent(sim, __ -> createSim(new REntityServer(), sim)).addPlayer(player);
+        return removed.get();
+    }
+
+    synchronized List<REntity> getEntitiesOfSimulator(Simulator simulator) {
+        REntityServer entityServer = entityServers.get(simulator);
+        if (entityServer == null) {
+            return Collections.emptyList();
+        }
+        return entityServer.getEntities();
+    }
+}
@@ -65,7 +65,7 @@ public final class TNTPhase extends SimulatorPhase {
            @Override
            public void accept(World world) {
                Location location = position.toLocation(world);
-                if (Region.getRegion(location).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
+                if (Region.getRegion(location).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
                TNTPrimed tnt = world.spawn(location, TNTPrimed.class);
                if (!xJump) tnt.setVelocity(tnt.getVelocity().setX(0));
                if (!yJump) tnt.setVelocity(tnt.getVelocity().setY(0));
@@ -1,54 +0,0 @@
-package de.steamwar.bausystem.features.simulator.display;
-
-import java.util.List;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerToggleSneakEvent;
-import de.steamwar.bausystem.utils.cursor.Cursor;
-import de.steamwar.entity.REntityServer;
-import lombok.Getter;
-
-public abstract class ASimulatorCursor extends Cursor implements Listener {
-  protected final Player owner;
-
-  @Getter
-  protected SimulatorCursorMode cursorMode;
-
-  protected ASimulatorCursor(Player owner, REntityServer targetServer, SimulatorCursorMode cursorMode) {
-    super(targetServer, owner, Material.GLASS, Material.TNT, List.of(Cursor.CursorMode.FREE, Cursor.CursorMode.BLOCK_ALIGNED));
-    this.cursorMode = cursorMode;
-    this.owner = owner;
-  }
-
-  public void swapCursorMode() {
-    cursorMode = cursorMode.switchType();
-    setCursorMaterial(cursorMode.getMaterial());
-    setAllowedCursorModes(cursorMode.getAllowedCursorModes());
-  }
-
-  public void setCursorMode(SimulatorCursorMode mode) {
-    this.cursorMode = mode;
-    setCursorMaterial(cursorMode.getMaterial());
-    setAllowedCursorModes(cursorMode.getAllowedCursorModes());
-  }
-
-  public void hide() {
-    super.hide();
-    super.getTargetServer().removePlayer(owner);
-  }
-
-  public void show() {
-    super.show();
-    super.getTargetServer().addPlayer(owner);
-  }
-
-  @EventHandler
-  public void onPlayerShift(PlayerToggleSneakEvent event) {
-    if (event.getPlayer() != owner) {
-      return;
-    }
-    swapCursorMode();
-  }
-}
@@ -1,47 +0,0 @@
-package de.steamwar.bausystem.features.simulator.display;
-
-import java.util.Optional;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.block.Action;
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.features.simulator.SimulatorStorage;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.inventory.SWAnvilInv;
-
-public class EmptySimulatorCursor extends ASimulatorCursor {
-  public EmptySimulatorCursor(Player owner, SimulatorCursorMode cursorMode) {
-    super(owner, new REntityServer(), cursorMode);
-  }
-
-  @Override
-  public void onClick(Optional<Location> clickedLocation, boolean clickedOnEntity, Action clickAction) {
-    if (clickAction == Action.RIGHT_CLICK_AIR) {
-      SimulatorStorage.openSimulatorSelector(owner);
-    } else if (clickAction == Action.RIGHT_CLICK_BLOCK) {
-      SWAnvilInv anvilInv = new SWAnvilInv(owner, "Name");
-      anvilInv.setCallback(name -> {
-        Simulator sim = SimulatorStorage.getSimulator(name);
-        if (sim != null) {
-          BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", owner);
-          return;
-        }
-        if (!name.matches("[a-zA-Z_0-9-]+")) {
-          BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", owner);
-          return;
-        }
-        sim = new Simulator(name);
-        SimulatorStorage.addSimulator(name, sim);
-        SimulatorElement<?> element = cursorMode.getElementFunction().apply(clickedLocation.get().toVector());
-        SimulatorGroup group = new SimulatorGroup();
-        group.add(element);
-        sim.add(group);
-        SimulatorStorage.setSimulator(owner, sim);
-      });
-      anvilInv.open();
-    }
-  }
-}
@@ -1,69 +0,0 @@
-package de.steamwar.bausystem.features.simulator.display;
-
-import java.util.List;
-import java.util.Optional;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.block.Action;
-import org.bukkit.util.Vector;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
-import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui;
-import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-
-public class SimulatorCursor extends ASimulatorCursor {
-  private final Simulator simulator;
-
-  public SimulatorCursor(Simulator simulator, Player owner, SimulatorCursorMode cursorMode) {
-    super(owner, SimulatorRenderer.renderSimulator(simulator), cursorMode);
-
-    this.simulator = simulator;
-  }
-
-
-  @Override
-  public void onClick(Optional<Location> clickedLocation, boolean clickedOnEntity, Action clickAction) {
-    if (clickAction == Action.LEFT_CLICK_AIR || clickAction == Action.LEFT_CLICK_BLOCK) {
-      SimulatorExecutor.run(owner, simulator, null);
-    } else if (!clickedOnEntity || clickedLocation.isEmpty()) {
-      new SimulatorGui(owner, simulator);
-    } else {
-      Vector vector = clickedLocation.get().toVector();
-      List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream)
-          .filter(element -> element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0)).toList();
-
-      switch (elements.size()) {
-        case 0:
-          return;
-        case 1:
-          // Open single element present in Simulator
-          SimulatorElement<?> element = elements.get(0);
-          SimulatorGroup group1 = element.getGroup(simulator);
-          SimulatorBaseGui back = new SimulatorGui(owner, simulator);
-          if (group1.getElements().size() > 1) {
-            back = new SimulatorGroupGui(owner, simulator, group1, back);
-          }
-          element.open(owner, simulator, group1, back);
-          break;
-        default:
-          List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().toList();
-          if (parents.size() == 1) {
-            // Open multi element present in Simulator in existing group
-            SimulatorGui simulatorGui = new SimulatorGui(owner, simulator);
-            new SimulatorGroupGui(owner, simulator, parents.get(0), simulatorGui).open();
-          } else {
-            // Open multi element present in Simulator in implicit group
-            SimulatorGroup group2 = new SimulatorGroup();
-            group2.setMaterial(null);
-            group2.getElements().addAll(elements);
-            SimulatorGui simulatorGui = new SimulatorGui(owner, simulator);
-            new SimulatorGroupGui(owner, simulator, group2, simulatorGui).open();
-          }
-          break;
-      }
-    }
-  }
-}
@@ -1,41 +0,0 @@
-package de.steamwar.bausystem.features.simulator.display;
-
-import java.util.List;
-import java.util.function.Function;
-import org.bukkit.Material;
-import org.bukkit.util.Vector;
-import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
-import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
-import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
-import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
-import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
-import de.steamwar.bausystem.utils.cursor.Cursor.CursorMode;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum SimulatorCursorMode {
-  TNT(Material.TNT, Material.GUNPOWDER, "TNT", vector -> new TNTElement(vector).add(new TNTPhase()),
-      List.of(CursorMode.FREE, CursorMode.BLOCK_ALIGNED)), REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE_WIRE, "Redstone Block",
-          vector -> new RedstoneElement(vector).add(new RedstonePhase()), List.of(CursorMode.BLOCK_ALIGNED)), OBSERVER(Material.OBSERVER, Material.QUARTZ,
-              "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase()), List.of(CursorMode.BLOCK_ALIGNED)),;
-
-  public final Material material;
-  public final Material nonSelectedMaterial;
-  public final String name;
-  public final Function<Vector, SimulatorElement<?>> elementFunction;
-  public final List<CursorMode> allowedCursorModes;
-
-  public SimulatorCursorMode switchType() {
-    if (this == TNT) {
-      return REDSTONE_BLOCK;
-    }
-    if (this == REDSTONE_BLOCK) {
-      return OBSERVER;
-    }
-    return TNT;
-  }
-}
@@ -1,78 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2023 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.simulator.display;
-
-import de.steamwar.bausystem.features.simulator.SimulatorStorage;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.storage.SimulatorSaver;
-import de.steamwar.bausystem.shared.Pair;
-import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RFallingBlockEntity;
-
-import lombok.experimental.UtilityClass;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.event.Listener;
-import org.bukkit.util.Vector;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-@UtilityClass
-public class SimulatorRenderer implements Listener {
-    private final World WORLD = Bukkit.getWorlds().get(0);
-    private Map<Simulator, REntityServer> entityServers = new HashMap<>();
-
-    public synchronized void update(Simulator simulator) {
-        renderSimulator(simulator);
-
-        SimulatorSaver.saveSimulator(SimulatorStorage.simulatorsDir, simulator);
-    }
-
-    public REntityServer renderSimulator(Simulator simulator) {
-        if (simulator == null) {
-            return null;
-        }
-
-        REntityServer server = entityServers.computeIfAbsent(simulator, __ -> new REntityServer());
-
-        server.getEntities().forEach(REntity::die);
-
-        Map<Vector, Set<Class<?>>> positionCache = new HashMap<>();
-        simulator.getGroups().stream().map(group -> group.getElements().stream().map(element -> new Pair<>(group, element)).toList()).flatMap(List::stream)
-                .forEach(pair -> {
-                    SimulatorGroup group = pair.getKey();
-                    SimulatorElement<?> element = pair.getValue();
-
-                    boolean wasNotPresent = positionCache.computeIfAbsent(element.getPosition(), __ -> new HashSet<>()).add(element.getClass());
-                    if (!wasNotPresent)
-                        return;
-                    Material material = group.isDisabled() || element.isDisabled() ? element.getWorldDisabledMaterial() : element.getWorldMaterial();
-                    Location location = element.getWorldPos().toLocation(WORLD);
-                    RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(server, location, material);
-                    rFallingBlockEntity.setNoGravity(true);
-                });
-        return server;
-    }
-}
@@ -19,14 +19,15 @@

 package de.steamwar.bausystem.features.simulator.execute;

+import com.destroystokyo.paper.event.server.ServerTickEndEvent;
+import com.destroystokyo.paper.event.server.ServerTickStartEvent;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.TickEndEvent;
-import de.steamwar.bausystem.utils.TickStartEvent;
+import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
@@ -109,8 +110,13 @@ public class SimulatorExecutor implements Listener {
        return true;
    }

+    private boolean tickStartRan = false;
+
    @EventHandler
-    public void onTickStart(TickStartEvent event) {
+    public void onServerTickStart(ServerTickStartEvent event) {
+        if (TickManager.impl.isFrozen()) return;
+        tickStartRan = true;
+
        long currentTick = TPSUtils.currentRealTick.get();
        Map<Integer, List<SimulatorAction>> actionsToRun = tickStartActions.remove(currentTick);
        if (actionsToRun == null) return;
@@ -123,7 +129,10 @@ public class SimulatorExecutor implements Listener {
    }

    @EventHandler
-    public void onTickEnd(TickEndEvent event) {
+    public void onServerTickEnd(ServerTickEndEvent event) {
+        if (!tickStartRan) return;
+        tickStartRan = false;
+
        long currentTick = TPSUtils.currentRealTick.get() - 1;
        List<SimulatorAction> actionsToRun = tickEndActions.remove(currentTick);
        if (actionsToRun == null) return;
@@ -35,8 +35,8 @@ public class StabFinalizer extends StabStep {
        try {
            PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
-            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
+            if (data.region.getRegionData().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
            }
            data.region.getTestblockArea().reset(pasteBuilder, true);
        } catch (SecurityException e) {
@@ -26,6 +26,7 @@ import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
@@ -51,6 +52,7 @@ public class StabGenerator extends StabStep implements Listener {

    @EventHandler
    public void onEntityExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) return;
        if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
            event.blockList().forEach(block -> {
                if (!data.region.getTestblockArea().inRegion(block.getLocation(), true))
@@ -71,8 +73,8 @@ public class StabGenerator extends StabStep implements Listener {
        try {
            PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
-            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
+            if (data.region.getRegionData().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
            }
            data.region.getTestblockArea().reset(pasteBuilder, true);
        } catch (SecurityException e) {
--- a/Show More
+++ b/Show More