forked from SteamWar/SteamWar
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a07067725f | ||
|
|
264e541fc7 | ||
|
|
82a59f772e | ||
|
|
2c44e50846 | ||
|
|
f51bce6a69 | ||
|
|
bf26dfed56 | ||
|
|
395303d04f |
@@ -1,60 +0,0 @@
|
||||
name: Bug Report
|
||||
about: Du hast einen Fehler gefunden? Melde ihn hier!
|
||||
labels: [ "typ/bug" ]
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
ACHTUNG: Sollte es bei dem Bug ein Sicherheitsrisiko geben, melde es bitte auf unserem Discord Server
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: Description
|
||||
description: |
|
||||
Beschreibe deinen Bug in kurzer Form.
|
||||
- type: input
|
||||
id: mc-ver
|
||||
attributes:
|
||||
label: Minecraft Version
|
||||
description: Minecraft Version des Clients
|
||||
validations:
|
||||
required: true
|
||||
- type: input
|
||||
id: mc-ver-ser
|
||||
attributes:
|
||||
label: Minecraft Version Server
|
||||
description: Minecraft Version des Servers, nur bei Bau oder Arenen Servern
|
||||
- type: dropdown
|
||||
id: can-reproduce
|
||||
attributes:
|
||||
label: Kannst du den Fehler wiederholen?
|
||||
description: |
|
||||
Wenn du den Fehler wiederholen kannst, können wir dieses Problem schneller beheben.
|
||||
Solltest du den Fehler nicht wiederholen können, melde dich bitte auf unserem Discord Server.
|
||||
options:
|
||||
- "Yes"
|
||||
- "No"
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: reproduce-steps
|
||||
attributes:
|
||||
label: Wie kannst du den Fehler wiederholen?
|
||||
description: Welche Schritte musst du ausführen, um den Fehler wiederholen zu können?
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: expected-result
|
||||
attributes:
|
||||
label: Was sollte passieren?
|
||||
description: Was sollte hier deiner Erwartung nach passieren?
|
||||
- type: input
|
||||
id: logs
|
||||
attributes:
|
||||
label: Auf welchem Server ist der Fehler aufgetreten?
|
||||
description: Gebe bitte den Namen des Servers an, auf dem der Fehler aufgetreten ist. z.B. "Lobby", "Lixfels Bauserver" etc.
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: Screenshots
|
||||
description: Sollte es ein Visuelles Problem geben, kannst du hier Screenshots hinzufügen.
|
||||
@@ -1 +0,0 @@
|
||||
blank_issues_enabled: true
|
||||
@@ -1,17 +0,0 @@
|
||||
name: Feature Idee
|
||||
about: Du hast eine Idee für ein neues Feature, welches SteamWar nicht hat? Stelle sie hier vor.
|
||||
labels: ["typ/idee"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: Feature Beschreibung
|
||||
placeholder: |
|
||||
Ich glaube, dass ...
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: Screenshots
|
||||
description: Wenn es sich um etwas grafisches handelt, kannst du hier Screenshots hinzufügen.
|
||||
@@ -1,193 +0,0 @@
|
||||
name: Backport CommonCore
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- closed
|
||||
branches:
|
||||
- main
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
|
||||
env:
|
||||
BACKPORT_PATH: CommonCore
|
||||
BACKPORT_BRANCH_PREFIX: backport/commoncore
|
||||
DISABLE_BACKPORT_LABEL: no-backport
|
||||
|
||||
jobs:
|
||||
backport:
|
||||
name: Create CommonCore backport PRs
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout sources
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Check backport eligibility
|
||||
id: eligibility
|
||||
shell: bash
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
|
||||
|
||||
echo "Backport debug: event=${GITHUB_EVENT_NAME:-unknown}"
|
||||
echo "Backport debug: server=${GITHUB_SERVER_URL}"
|
||||
echo "Backport debug: api=${api_url}"
|
||||
echo "Backport debug: repository=${GITHUB_REPOSITORY}"
|
||||
echo "Backport debug: action=$(jq -r '.action // ""' "$GITHUB_EVENT_PATH")"
|
||||
|
||||
merged="$(jq -r '.pull_request.merged // (.pull_request.merged_at != null)' "$GITHUB_EVENT_PATH")"
|
||||
base_branch="$(jq -r '.pull_request.base.ref' "$GITHUB_EVENT_PATH")"
|
||||
has_disable_label="$(jq -r --arg disable_backport_label "$DISABLE_BACKPORT_LABEL" 'any(.pull_request.labels[]?; .name == $disable_backport_label)' "$GITHUB_EVENT_PATH")"
|
||||
echo "Backport debug: pr=$(jq -r '.pull_request.number // ""' "$GITHUB_EVENT_PATH") base=${base_branch} merged=${merged}"
|
||||
echo "Backport debug: disable label present=${has_disable_label}"
|
||||
|
||||
{
|
||||
echo "should_backport=$([[ "$merged" == "true" && "$base_branch" == "main" && "$has_disable_label" != "true" ]] && echo true || echo false)"
|
||||
echo "pr_number=$(jq -r '.pull_request.number' "$GITHUB_EVENT_PATH")"
|
||||
echo "pr_title<<EOF"
|
||||
jq -r '.pull_request.title' "$GITHUB_EVENT_PATH"
|
||||
echo "EOF"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
|
||||
labels="$(curl -fsS \
|
||||
-H "Accept: application/json" \
|
||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
||||
"${api_url}/repos/${GITHUB_REPOSITORY}/labels")"
|
||||
|
||||
if ! jq -e --arg disable_backport_label "$DISABLE_BACKPORT_LABEL" 'any(.[]; .name == $disable_backport_label)' <<< "$labels" >/dev/null; then
|
||||
curl -fsS -X POST \
|
||||
-H "Accept: application/json" \
|
||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --arg name "$DISABLE_BACKPORT_LABEL" --arg color "ededed" --arg description "Disable automatic CommonCore backporting for this pull request." '{name: $name, color: $color, description: $description}')" \
|
||||
"${api_url}/repos/${GITHUB_REPOSITORY}/labels"
|
||||
fi
|
||||
|
||||
- name: Create backport pull requests
|
||||
if: steps.eligibility.outputs.should_backport == 'true'
|
||||
shell: bash
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
|
||||
PR_NUMBER: ${{ steps.eligibility.outputs.pr_number }}
|
||||
PR_TITLE: ${{ steps.eligibility.outputs.pr_title }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
|
||||
repo_api_path="/repos/${GITHUB_REPOSITORY}"
|
||||
|
||||
api_request() {
|
||||
local method="$1"
|
||||
local path="$2"
|
||||
local output="$3"
|
||||
local data_file="${4:-}"
|
||||
local status
|
||||
local args=(-sS -X "$method" -H "Accept: application/json" -H "Authorization: token ${GITHUB_TOKEN}" -w "%{http_code}" -o "$output")
|
||||
|
||||
if [[ -n "$data_file" ]]; then
|
||||
args+=(-H "Content-Type: application/json" --data-binary "@${data_file}")
|
||||
fi
|
||||
|
||||
echo "Backport debug: ${method} ${path}"
|
||||
if ! status="$(curl "${args[@]}" "${api_url}${path}")"; then
|
||||
echo "Backport debug: ${method} ${path} failed before HTTP status was captured."
|
||||
if [[ -s "$output" ]]; then
|
||||
echo "Backport debug: response body:"
|
||||
cat "$output"
|
||||
fi
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "Backport debug: ${method} ${path} -> HTTP ${status}"
|
||||
if [[ ! "$status" =~ ^2 ]]; then
|
||||
echo "Backport debug: response body:"
|
||||
cat "$output"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
echo "Backport debug: event=${GITHUB_EVENT_NAME:-unknown}"
|
||||
echo "Backport debug: server=${GITHUB_SERVER_URL}"
|
||||
echo "Backport debug: api=${api_url}"
|
||||
echo "Backport debug: repository=${GITHUB_REPOSITORY}"
|
||||
echo "Backport debug: pr=${PR_NUMBER}"
|
||||
echo "Backport debug: actor=${GITHUB_ACTOR:-unknown}"
|
||||
|
||||
git config user.name "SteamWar Backport Bot"
|
||||
git config user.email "actions@steamwar.de"
|
||||
|
||||
if [[ "${GITHUB_SERVER_URL}" == https://* ]]; then
|
||||
auth_host="${GITHUB_SERVER_URL#https://}"
|
||||
git remote set-url origin "https://oauth2:${GITHUB_TOKEN}@${auth_host}/${GITHUB_REPOSITORY}.git"
|
||||
fi
|
||||
|
||||
git fetch --prune origin '+refs/heads/version/*:refs/remotes/origin/version/*'
|
||||
|
||||
api_request GET "${repo_api_path}" repo-debug.json
|
||||
jq -r '"Backport debug: repo permissions admin=\(.permissions.admin // "unknown") push=\(.permissions.push // "unknown") pull=\(.permissions.pull // "unknown")"' repo-debug.json || true
|
||||
|
||||
echo "Backport debug: GET ${repo_api_path}/pulls/${PR_NUMBER}.diff"
|
||||
curl -fsSL -w "Backport debug: GET ${repo_api_path}/pulls/${PR_NUMBER}.diff -> HTTP %{http_code}\n" \
|
||||
-H "Accept: text/plain" \
|
||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
||||
"${api_url}${repo_api_path}/pulls/${PR_NUMBER}.diff" \
|
||||
-o pull-request.diff
|
||||
|
||||
if ! grep -Eq "^diff --git a/${BACKPORT_PATH}/" pull-request.diff; then
|
||||
echo "Pull request #${PR_NUMBER} has no ${BACKPORT_PATH} changes to backport."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
mapfile -t target_branches < <(git for-each-ref --format='%(refname:strip=3)' refs/remotes/origin/version)
|
||||
if [[ "${#target_branches[@]}" -eq 0 ]]; then
|
||||
echo "No version/* branches found."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for target_branch in "${target_branches[@]}"; do
|
||||
safe_target="${target_branch//\//-}"
|
||||
backport_branch="${BACKPORT_BRANCH_PREFIX}/pr-${PR_NUMBER}-to-${safe_target}"
|
||||
|
||||
git checkout -B "${backport_branch}" "origin/${target_branch}"
|
||||
git reset --hard "origin/${target_branch}"
|
||||
|
||||
if ! git apply --3way --index --include="${BACKPORT_PATH}/**" pull-request.diff; then
|
||||
echo "Failed to apply CommonCore backport for ${target_branch}."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if git diff --cached --quiet; then
|
||||
echo "CommonCore changes from #${PR_NUMBER} are already present in ${target_branch}."
|
||||
continue
|
||||
fi
|
||||
|
||||
git commit -m "Backport CommonCore changes from #${PR_NUMBER}" -m "${PR_TITLE}"
|
||||
git push --force-with-lease origin "${backport_branch}"
|
||||
|
||||
api_request GET "${repo_api_path}/pulls?state=open" open-pulls.json
|
||||
open_pr_number="$(jq -r --arg base "$target_branch" --arg head "$backport_branch" '[.[] | select(.base.ref == $base and .head.ref == $head) | (.number // .index)][0] // empty' open-pulls.json)"
|
||||
|
||||
if [[ -n "$open_pr_number" ]]; then
|
||||
echo "Backport PR #${open_pr_number} already exists for ${target_branch}."
|
||||
continue
|
||||
fi
|
||||
|
||||
pr_body="$(printf 'Automatic CommonCore backport of #%s.\n\nOriginal PR title: %s\n\nOnly files below `CommonCore/` are included.' "$PR_NUMBER" "$PR_TITLE")"
|
||||
|
||||
jq -n \
|
||||
--arg base "$target_branch" \
|
||||
--arg head "$backport_branch" \
|
||||
--arg title "Backport CommonCore changes from #${PR_NUMBER} to ${target_branch}" \
|
||||
--arg body "$pr_body" \
|
||||
'{base: $base, head: $head, title: $title, body: $body}' > create-pull.json
|
||||
|
||||
echo "Backport debug: create PR base=${target_branch} head=${backport_branch}"
|
||||
api_request POST "${repo_api_path}/pulls" create-pull-response.json create-pull.json
|
||||
done
|
||||
@@ -1,147 +0,0 @@
|
||||
name: Deploy
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- version/*
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout sources
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Java 8
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 8
|
||||
- name: Setup Java 11
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 11
|
||||
- name: Setup Java 17
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 17
|
||||
- name: Setup Java
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v6
|
||||
- name: Setup Maven Repository
|
||||
env:
|
||||
SW_MAVEN_CREDENTIALS: ${{ secrets.SW_MAVEN_CREDENTIALS }}
|
||||
run: |
|
||||
echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew build --no-daemon
|
||||
|
||||
- name: Stage deploy artifacts
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
rm -rf deploy
|
||||
mkdir -p deploy
|
||||
|
||||
cp "BauSystem/build/libs/BauSystem-all.jar" "deploy/BauSystem.jar"
|
||||
cp "LegacyBauSystem/build/libs/LegacyBauSystem.jar" "deploy/BauSystem-1.12.jar"
|
||||
cp "FightSystem/build/libs/FightSystem-all.jar" "deploy/FightSystem.jar"
|
||||
cp "KotlinCore/build/libs/KotlinCore-all.jar" "deploy/KotlinCore.jar"
|
||||
cp "TNTLeague/build/libs/TNTLeague.jar" "deploy/TNTLeague.jar"
|
||||
cp "LobbySystem/build/libs/LobbySystem.jar" "deploy/LobbySystem.jar"
|
||||
cp "MissileWars/build/libs/MissileWars.jar" "deploy/MissileWars.jar"
|
||||
cp "Realtime/build/libs/Realtime.jar" "deploy/RealTime.jar"
|
||||
cp "SchematicSystem/build/libs/SchematicSystem-all.jar" "deploy/SchematicSystem.jar"
|
||||
cp "SpigotCore/build/libs/SpigotCore-all.jar" "deploy/SpigotCore.jar"
|
||||
cp "Teamserver/build/libs/Teamserver.jar" "deploy/Builder.jar"
|
||||
cp "TowerRun/build/libs/TowerRun.jar" "deploy/TowerRun.jar"
|
||||
cp "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'"
|
||||
ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH/upload'"
|
||||
scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/upload"
|
||||
ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -f '$DEPLOY_PATH'/*.jar '$DEPLOY_PATH'/*.zip"
|
||||
ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mv '$DEPLOY_PATH'/upload/* '$DEPLOY_PATH'"
|
||||
ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -r '$DEPLOY_PATH/upload'"
|
||||
ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "chmod o-w '$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"
|
||||
@@ -1,76 +0,0 @@
|
||||
name: Pull Request Build
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout sources
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Java 8
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 8
|
||||
- name: Setup Java 11
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 11
|
||||
- name: Setup Java 17
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 17
|
||||
- name: Setup Java
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v6
|
||||
- name: Setup Maven Repository
|
||||
env:
|
||||
SW_MAVEN_CREDENTIALS: ${{ secrets.SW_MAVEN_CREDENTIALS }}
|
||||
run: |
|
||||
echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew build --no-daemon
|
||||
|
||||
- name: Merge successful backport PR
|
||||
shell: bash
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
|
||||
BACKPORT_BRANCH_PREFIX: backport/commoncore
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
head_branch="$(jq -r '.pull_request.head.ref // ""' "$GITHUB_EVENT_PATH")"
|
||||
base_branch="$(jq -r '.pull_request.base.ref // ""' "$GITHUB_EVENT_PATH")"
|
||||
pr_number="$(jq -r '.pull_request.number' "$GITHUB_EVENT_PATH")"
|
||||
|
||||
if [[ "${head_branch}" != "${BACKPORT_BRANCH_PREFIX}/"* ]]; then
|
||||
echo "Not a CommonCore backport PR."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "${base_branch}" != version/* ]]; then
|
||||
echo "Backport PR target is not a version/* branch."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
|
||||
|
||||
curl -fsS -X POST \
|
||||
-H "Accept: application/json" \
|
||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"Do":"merge","delete_branch_after_merge":true}' \
|
||||
"${api_url}/repos/${GITHUB_REPOSITORY}/pulls/${pr_number}/merge"
|
||||
+1
-1
@@ -21,4 +21,4 @@ lib
|
||||
/WebsiteBackend/logs
|
||||
/WebsiteBackend/skins
|
||||
/WebsiteBackend/config.json
|
||||
/WebsiteBackend/sessions
|
||||
/WebsiteBackend/sessions
|
||||
@@ -864,7 +864,6 @@ LAUFBAU_SETTINGS_ADVANCED=§eLeft-Click §8-§7 Advanced settings
|
||||
LAUFBAU_BLOCK_COBWEB=§eCobweb
|
||||
LAUFBAU_BLOCK_GRASS_PATH=§eGrass Path
|
||||
LAUFBAU_BLOCK_SOUL_SAND=§eSoul Sand
|
||||
LAUFBAU_BLOCK_MUD=§eMud
|
||||
LAUFBAU_BLOCK_COCOA=§eCocoa
|
||||
LAUFBAU_BLOCK_TURTLE_EGG=§eTurtle Eggs
|
||||
LAUFBAU_BLOCK_CHEST=§eChest
|
||||
|
||||
@@ -802,7 +802,6 @@ LAUFBAU_SETTINGS_ADVANCED=§eLinks-Click §8-§7 Erweiterte Einstellung
|
||||
LAUFBAU_BLOCK_COBWEB=§eCobweb
|
||||
LAUFBAU_BLOCK_GRASS_PATH=§eGrass Path
|
||||
LAUFBAU_BLOCK_SOUL_SAND=§eSoul Sand
|
||||
LAUFBAU_BLOCK_MUD=§eMud
|
||||
LAUFBAU_BLOCK_COCOA=§eCocoa
|
||||
LAUFBAU_BLOCK_TURTLE_EGG=§eTurtle Eggs
|
||||
LAUFBAU_BLOCK_CHEST=§eChest
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.features.dev;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
@Linked
|
||||
public class CreateKitCommand extends SWCommand {
|
||||
|
||||
public CreateKitCommand() {
|
||||
super("createkit");
|
||||
if (!BauSystem.DEV_SERVER) unregister();
|
||||
}
|
||||
|
||||
@Register
|
||||
public void onCommand(Player player, String name) {
|
||||
YamlConfiguration yaml = new YamlConfiguration();
|
||||
|
||||
yaml.set("Items", player.getInventory().getContents());
|
||||
yaml.set("Armor", player.getInventory().getArmorContents());
|
||||
yaml.set("Effects", player.getActivePotionEffects());
|
||||
yaml.set("LeaderAllowed", true);
|
||||
yaml.set("MemberAllowed", true);
|
||||
yaml.set("EnterStage", 0);
|
||||
yaml.set("TNT", true);
|
||||
|
||||
YamlConfiguration kits = new YamlConfiguration();
|
||||
|
||||
kits.set("Kits." + name, yaml);
|
||||
|
||||
try {
|
||||
kits.save(new File("new.kits.yaml"));
|
||||
|
||||
player.sendMessage("Kit created!");
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -67,7 +67,11 @@ public class TNTListener implements Listener, ScoreboardElement {
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
|
||||
public void onExplode(EntityExplodeEvent event) {
|
||||
explode(event.blockList(), event.getEntity() instanceof TNTPrimed);
|
||||
if (!(event.getEntity() instanceof TNTPrimed)) {
|
||||
event.blockList().clear();
|
||||
return;
|
||||
}
|
||||
explode(event.blockList(), true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+1
-5
@@ -101,11 +101,7 @@ public class BlockBoundingBox {
|
||||
addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);
|
||||
|
||||
addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
|
||||
addPixel(Material.SOUL_SAND.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
|
||||
|
||||
if (Core.getVersion() >= 19) {
|
||||
addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_MUD", Material.MUD));
|
||||
}
|
||||
addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
|
||||
|
||||
Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();
|
||||
cocoaNorth.setAge(2);
|
||||
|
||||
+2
@@ -25,12 +25,14 @@ import de.steamwar.bausystem.shared.Pair;
|
||||
import de.steamwar.bausystem.utils.WorldEditUtils;
|
||||
import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import de.steamwar.linkage.MinVersion;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
@Linked
|
||||
@MinVersion(19)
|
||||
public class LaufbauCommand extends SWCommand {
|
||||
|
||||
public LaufbauCommand() {
|
||||
|
||||
+1
-11
@@ -135,7 +135,7 @@ public abstract class ViewFlag {
|
||||
}
|
||||
|
||||
Location secoundLocation;
|
||||
if (Math.abs(previousVelocity.getX()) >= Math.abs(previousVelocity.getZ())) {
|
||||
if (previousVelocity.getX() >= previousVelocity.getZ()) {
|
||||
secoundLocation = previous.getLocation().clone().add(delta.getX(), delta.getY(), 0);
|
||||
} else {
|
||||
secoundLocation = previous.getLocation().clone().add(0, delta.getY(), delta.getZ());
|
||||
@@ -198,16 +198,6 @@ public abstract class ViewFlag {
|
||||
}
|
||||
};
|
||||
|
||||
public static ViewFlag HIGHLIGHT = new ViewFlag(true, false, "highlight", "h") {
|
||||
@Override
|
||||
public void modify(REntityServer server, List<TraceEntity> entities) {
|
||||
for (TraceEntity entity : entities) {
|
||||
entity.setGlowing(true);
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
* Name of the flag
|
||||
*/
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
plugins {
|
||||
steamwar.kotlin
|
||||
application
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain(21)
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
}
|
||||
|
||||
application {
|
||||
mainClass.set("de.steamwar.MainKt")
|
||||
applicationName = "sw"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(project(":CommonCore:SQL"))
|
||||
|
||||
implementation("com.github.ajalt.clikt:clikt:5.0.3")
|
||||
implementation("com.github.ajalt.mordant:mordant:3.0.2")
|
||||
implementation(libs.logback)
|
||||
implementation("org.mariadb.jdbc:mariadb-java-client:3.3.1")
|
||||
|
||||
implementation(libs.exposedCore)
|
||||
implementation(libs.exposedDao)
|
||||
implementation(libs.exposedJdbc)
|
||||
implementation(libs.exposedTime)
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package de.steamwar
|
||||
|
||||
import com.github.ajalt.clikt.core.main
|
||||
import com.github.ajalt.clikt.core.subcommands
|
||||
import de.steamwar.commands.SteamWar
|
||||
import de.steamwar.commands.database.DatabaseCommand
|
||||
import de.steamwar.commands.database.InfoCommand
|
||||
import de.steamwar.commands.database.ResetCommand
|
||||
import de.steamwar.commands.dev.DevCommand
|
||||
import de.steamwar.commands.profiler.ProfilerCommand
|
||||
import de.steamwar.commands.user.UserCommand
|
||||
import de.steamwar.commands.user.UserInfoCommand
|
||||
import de.steamwar.commands.user.UserSearchCommand
|
||||
|
||||
fun main(args: Array<String>) = SteamWar()
|
||||
.subcommands(
|
||||
DatabaseCommand().subcommands(InfoCommand(), ResetCommand()),
|
||||
UserCommand().subcommands(UserInfoCommand(), UserSearchCommand()),
|
||||
DevCommand(),
|
||||
ProfilerCommand()
|
||||
)
|
||||
.main(args)
|
||||
@@ -1,10 +0,0 @@
|
||||
package de.steamwar.commands
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.mordant.rendering.TextStyles
|
||||
|
||||
class SteamWar: CliktCommand(name = "sw") {
|
||||
override fun run() {
|
||||
echo(TextStyles.bold("SteamWar-CLI"))
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package de.steamwar.commands.database
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.CliktError
|
||||
import com.github.ajalt.clikt.core.Context
|
||||
import com.github.ajalt.clikt.core.findOrSetObject
|
||||
import com.github.ajalt.clikt.parameters.options.flag
|
||||
import com.github.ajalt.clikt.parameters.options.option
|
||||
import de.steamwar.db.Database
|
||||
|
||||
class DatabaseCommand: CliktCommand(name = "db") {
|
||||
val useProduction by option().flag()
|
||||
val db by findOrSetObject { Database }
|
||||
|
||||
override fun help(context: Context): String = "Run database commands"
|
||||
|
||||
override fun run() {
|
||||
if (!useProduction && db.database == "production") {
|
||||
throw CliktError("You should not use the production database!")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package de.steamwar.commands.database
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.requireObject
|
||||
import com.github.ajalt.mordant.table.table
|
||||
import de.steamwar.db.Database
|
||||
import de.steamwar.db.execute
|
||||
import de.steamwar.db.useDb
|
||||
|
||||
class InfoCommand: CliktCommand() {
|
||||
val db by requireObject<Database>()
|
||||
|
||||
override fun run() = useDb {
|
||||
val tables = execute("SHOW TABLES") { it.getString(1) }
|
||||
|
||||
echo(
|
||||
table {
|
||||
header { row("Name") }
|
||||
body {
|
||||
tables.map { row(it) }
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package de.steamwar.commands.database
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.CliktError
|
||||
import com.github.ajalt.clikt.core.requireObject
|
||||
import com.github.ajalt.mordant.rendering.TextColors
|
||||
import com.github.ajalt.mordant.rendering.TextStyles
|
||||
import de.steamwar.db.Database
|
||||
import de.steamwar.db.execute
|
||||
import de.steamwar.db.useDb
|
||||
import java.io.File
|
||||
|
||||
class ResetCommand: CliktCommand() {
|
||||
val db by requireObject<Database>()
|
||||
|
||||
override fun run() = useDb {
|
||||
val schemaFile = File("/var/Schema.sql")
|
||||
if (!schemaFile.exists()) {
|
||||
throw CliktError("Schema file not found!")
|
||||
}
|
||||
|
||||
val schema = schemaFile.readText()
|
||||
|
||||
val tables = execute("SHOW TABLES;") { it.getString(1) }
|
||||
for (table in tables) {
|
||||
execute("DROP TABLE IF EXISTS $table;") { }
|
||||
}
|
||||
|
||||
execute(schema) { }
|
||||
|
||||
echo(TextColors.brightGreen(TextStyles.bold("Database reset!")))
|
||||
}
|
||||
}
|
||||
@@ -1,179 +0,0 @@
|
||||
package de.steamwar.commands.dev
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.CliktError
|
||||
import com.github.ajalt.clikt.core.Context
|
||||
import com.github.ajalt.clikt.parameters.arguments.argument
|
||||
import com.github.ajalt.clikt.parameters.arguments.help
|
||||
import com.github.ajalt.clikt.parameters.arguments.multiple
|
||||
import com.github.ajalt.clikt.parameters.options.default
|
||||
import com.github.ajalt.clikt.parameters.options.defaultLazy
|
||||
import com.github.ajalt.clikt.parameters.options.flag
|
||||
import com.github.ajalt.clikt.parameters.options.help
|
||||
import com.github.ajalt.clikt.parameters.options.option
|
||||
import com.github.ajalt.clikt.parameters.types.file
|
||||
import com.github.ajalt.clikt.parameters.types.long
|
||||
import com.github.ajalt.clikt.parameters.types.path
|
||||
import com.sun.security.auth.module.UnixSystem
|
||||
import java.io.File
|
||||
import kotlin.io.path.absolute
|
||||
import kotlin.io.path.absolutePathString
|
||||
|
||||
const val LOG4J_CONFIG = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration status="WARN" packages="com.mojang.util">
|
||||
<Appenders>
|
||||
<Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
|
||||
<Queue name="TerminalConsole">
|
||||
<PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
|
||||
</Queue>
|
||||
<RollingRandomAccessFile name="File" fileName="$\{'sys:logPath'}/latest.log" filePattern="$\{'sys:logPath'}/%d{yyyy.MM.dd}.log.gz">
|
||||
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
|
||||
<Policies>
|
||||
<TimeBasedTriggeringPolicy />
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="7"/>
|
||||
</RollingRandomAccessFile>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<Root level="info">
|
||||
<filters>
|
||||
<MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
|
||||
</filters>
|
||||
<AppenderRef ref="WINDOWS_COMPAT" level="info"/>
|
||||
<AppenderRef ref="File"/>
|
||||
<AppenderRef ref="TerminalConsole" level="info"/>
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>"""
|
||||
|
||||
class DevCommand : CliktCommand("dev") {
|
||||
override fun help(context: Context): String = "Start a dev Server"
|
||||
|
||||
override val treatUnknownOptionsAsArgs = true
|
||||
|
||||
val server by argument().help("Server Template")
|
||||
val port by option("--port").long().defaultLazy { UnixSystem().uid + 1010 }.help("Port for Server")
|
||||
val world by option("--world", "-w").path(canBeFile = false).help("User World")
|
||||
val plugins by option("--plugins", "-p").path(true, canBeFile = false).help("Plugin Dir")
|
||||
val profile by option().flag().help("Add Profiling Arguments")
|
||||
val forceUpgrade by option().flag().help("Force Upgrade")
|
||||
val jar by option().file(true, canBeDir = false).help("Jar File")
|
||||
val jvm by option().file(true, canBeDir = false).help("Java Executable")
|
||||
val jvmArgs by argument().multiple()
|
||||
|
||||
override val printHelpOnEmptyArgs = true
|
||||
|
||||
val workingDir = File("").absoluteFile
|
||||
val log4jConfig = File(workingDir, "log4j2.xml")
|
||||
|
||||
override fun run() {
|
||||
val args = mutableListOf<String>()
|
||||
|
||||
val serverDirectory = File(workingDir, server)
|
||||
val serverDir =
|
||||
if (serverDirectory.exists() && serverDirectory.isDirectory) serverDirectory else File(workingDir, server)
|
||||
|
||||
if (isVelocity(server)) {
|
||||
runServer(args, jvmArgs, listOf(jar?.absolutePath ?: File("/jar/Velocity.jar").absolutePath), serverDir)
|
||||
} else {
|
||||
setLogConfig(args)
|
||||
val version = findVersion(server) ?: throw CliktError("Unknown Server Version")
|
||||
val worldFile = world?.absolute()?.toFile() ?: File(serverDir, "devtempworld")
|
||||
val jarFile = jar?.absolutePath ?: additionalVersions[server]?.let { supportedVersionJars[it] } ?: supportedVersionJars[version]
|
||||
?: throw CliktError("Unknown Server Version")
|
||||
|
||||
if (!worldFile.exists()) {
|
||||
val templateFile = File(serverDir, "Bauwelt")
|
||||
if (!templateFile.exists()) {
|
||||
throw CliktError("World Template not found!")
|
||||
}
|
||||
templateFile.copyRecursively(worldFile)
|
||||
}
|
||||
|
||||
val devFile = File("/configs/DevServer/${System.getProperty("user.name")}.$port.$version")
|
||||
if (System.getProperty("user.name") != "minecraft") {
|
||||
devFile.createNewFile()
|
||||
}
|
||||
|
||||
runServer(
|
||||
args, jvmArgs, listOf(
|
||||
jarFile,
|
||||
*(if (forceUpgrade) arrayOf("-forceUpgrade") else arrayOf()),
|
||||
"--port", port.toString(),
|
||||
"--level-name", worldFile.name,
|
||||
"--world-dir", workingDir.absolutePath,
|
||||
"--nogui",
|
||||
*(if (plugins != null) arrayOf("--plugins", plugins!!.absolutePathString()) else arrayOf())
|
||||
), serverDir
|
||||
)
|
||||
|
||||
try {
|
||||
devFile.delete()
|
||||
} catch (_: Exception) { /* ignored */ }
|
||||
}
|
||||
}
|
||||
|
||||
val jvmDefaultParams = arrayOf(
|
||||
"-Xmx1G",
|
||||
"-Xgc:excessiveGCratio=80",
|
||||
"-Xsyslog:none",
|
||||
"-Xtrace:none",
|
||||
"-Xnoclassgc",
|
||||
"-Xdisableexplicitgc",
|
||||
"-XX:+AlwaysPreTouch",
|
||||
"-XX:+CompactStrings",
|
||||
"-XX:-HeapDumpOnOutOfMemory",
|
||||
"-XX:+ExitOnOutOfMemoryError"
|
||||
)
|
||||
|
||||
val jvmArgOverrides = arrayOf("--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED")
|
||||
|
||||
val supportedVersionJars = mapOf(
|
||||
8 to "/jars/paper-1.8.8.jar",
|
||||
9 to "/jars/spigot-1.9.4.jar",
|
||||
10 to "/jars/paper-1.10.2.jar",
|
||||
12 to "/jars/spigot-1.12.2.jar",
|
||||
14 to "/jars/spigot-1.14.4.jar",
|
||||
15 to "/jars/spigot-1.15.2.jar",
|
||||
18 to "/jars/paper-1.18.2.jar",
|
||||
19 to "/jars/paper-1.19.3.jar",
|
||||
20 to "/jars/paper-1.20.1.jar",
|
||||
21 to "/jars/paper-1.21.6.jar"
|
||||
)
|
||||
|
||||
val additionalVersions = mapOf(
|
||||
"Tutorial" to 15,
|
||||
"Lobby" to 20
|
||||
)
|
||||
|
||||
fun findVersion(server: String): Int? = server.dropWhile { !it.isDigit() }.toIntOrNull()
|
||||
|
||||
fun isJava8(server: String): Boolean = findVersion(server)?.let { it <= 10 } ?: false
|
||||
|
||||
fun isVelocity(server: String): Boolean = server.endsWith("Velocity")
|
||||
|
||||
fun setLogConfig(args: MutableList<String>) {
|
||||
args += "-DlogPath=${workingDir.absolutePath}/logs"
|
||||
args += "-Dlog4j.configurationFile=${log4jConfig.absolutePath}"
|
||||
|
||||
if (!log4jConfig.exists()) {
|
||||
log4jConfig.writeText(LOG4J_CONFIG)
|
||||
}
|
||||
}
|
||||
|
||||
fun runServer(args: List<String>, jvmArgs: List<String>, cmd: List<String>, serverDir: File) {
|
||||
val process = ProcessBuilder(
|
||||
jvm?.absolutePath ?: if (isJava8(server)) "/usr/lib/jvm/openj9-8/bin/java" else "java",
|
||||
*jvmArgs.toTypedArray(),
|
||||
*args.toTypedArray(),
|
||||
*jvmDefaultParams,
|
||||
*(if (isJava8(server)) arrayOf() else jvmArgOverrides),
|
||||
*(if (profile) arrayOf("-javaagent:/jars/LixfelsProfiler.jar=start") else arrayOf()),
|
||||
"-Xshareclasses:nonfatal,name=$server",
|
||||
"-jar",
|
||||
*cmd.toTypedArray()
|
||||
).directory(serverDir).inheritIO().start()
|
||||
Runtime.getRuntime().addShutdownHook(Thread { if (process.isAlive) process.destroyForcibly() })
|
||||
process.waitFor()
|
||||
}
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package de.steamwar.commands.profiler
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.Context
|
||||
import com.github.ajalt.clikt.parameters.arguments.argument
|
||||
import com.github.ajalt.clikt.parameters.arguments.help
|
||||
import com.github.ajalt.clikt.parameters.arguments.optional
|
||||
import com.github.ajalt.clikt.parameters.options.default
|
||||
import com.github.ajalt.clikt.parameters.options.option
|
||||
import com.github.ajalt.clikt.parameters.types.int
|
||||
|
||||
const val SPARK = "/jars/spark.jar"
|
||||
|
||||
class ProfilerCommand: CliktCommand("profiler") {
|
||||
val pid by argument().help("Process id").int().optional()
|
||||
val port by option("--port", "-p").int().default(8543)
|
||||
|
||||
override fun run() {
|
||||
if (pid != null) {
|
||||
ProcessBuilder()
|
||||
.command("java", "-jar", SPARK, pid.toString(), "port=$port")
|
||||
.start()
|
||||
.waitFor()
|
||||
|
||||
Thread.sleep(1000)
|
||||
|
||||
ProcessBuilder()
|
||||
.command("ssh", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-p", port.toString(), "spark@localhost")
|
||||
.inheritIO()
|
||||
.start()
|
||||
.waitFor()
|
||||
} else {
|
||||
ProcessBuilder()
|
||||
.command("java", "-jar", SPARK)
|
||||
.inheritIO()
|
||||
.start()
|
||||
.waitFor()
|
||||
}
|
||||
}
|
||||
|
||||
override fun help(context: Context): String = "Start a profiler"
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package de.steamwar.commands.user
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.Context
|
||||
|
||||
class UserCommand: CliktCommand("user") {
|
||||
override fun run() = Unit
|
||||
override fun help(context: Context): String = "User related commands"
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
package de.steamwar.commands.user
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.CliktError
|
||||
import com.github.ajalt.clikt.parameters.arguments.argument
|
||||
import com.github.ajalt.clikt.parameters.arguments.help
|
||||
import com.github.ajalt.mordant.table.table
|
||||
import de.steamwar.db.findUser
|
||||
import de.steamwar.db.useDb
|
||||
import de.steamwar.sql.Punishment
|
||||
import de.steamwar.sql.SessionTable
|
||||
import de.steamwar.sql.SteamwarUser
|
||||
import de.steamwar.sql.Team
|
||||
import org.jetbrains.exposed.v1.core.eq
|
||||
import org.jetbrains.exposed.v1.jdbc.selectAll
|
||||
import java.time.Duration
|
||||
|
||||
class UserInfoCommand : CliktCommand("info") {
|
||||
val userId by argument().help("Id, Name, UUID or DiscordId")
|
||||
val user by lazy { findUser(userId) ?: throw CliktError("User not found") }
|
||||
|
||||
override val printHelpOnEmptyArgs = true
|
||||
|
||||
override fun run() = useDb {
|
||||
val sessions =
|
||||
SessionTable.selectAll().where { SessionTable.userId eq user.id.value }
|
||||
.map { it[SessionTable.startTime] to it[SessionTable.endTime] }
|
||||
|
||||
val totalPlayed = sessions.sumOf { Duration.between(it.first, it.second).toMinutes() } / 60.0
|
||||
val firstJoin = sessions.minByOrNull { it.first }?.first
|
||||
val lastJoin = sessions.maxByOrNull { it.second }?.second
|
||||
|
||||
val punishments = Punishment.getAllPunishmentsOfPlayer(user.id.value)
|
||||
|
||||
echo(
|
||||
table {
|
||||
body {
|
||||
row("Name", user.userName)
|
||||
row("UUID", user.uuid)
|
||||
row("Team", Team.byId(user.team).teamName)
|
||||
row("Leader", user.leader)
|
||||
row("Locale", user.locale)
|
||||
row("Beigetreten am", firstJoin)
|
||||
row("Zuletzt gesehen am", lastJoin)
|
||||
row("Spielzeit", totalPlayed.toString() + "h")
|
||||
row("Punishments", if (punishments.isEmpty()) "Keine" else table {
|
||||
header { row("Typ", "Ersteller", "Von", "Bis", "Grund") }
|
||||
body {
|
||||
punishments.map {
|
||||
row(
|
||||
it.type,
|
||||
SteamwarUser.byId(it.punisher)?.userName ?: it.punisher,
|
||||
it.startTime.toString(),
|
||||
if (it.perma) "Perma" else it.endTime.toString(),
|
||||
it.reason
|
||||
)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package de.steamwar.commands.user
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
import com.github.ajalt.clikt.core.Context
|
||||
import com.github.ajalt.clikt.parameters.arguments.argument
|
||||
import com.github.ajalt.clikt.parameters.arguments.help
|
||||
import com.github.ajalt.mordant.table.table
|
||||
import de.steamwar.db.joinedOr
|
||||
import de.steamwar.db.useDb
|
||||
import de.steamwar.sql.SteamwarUser
|
||||
import de.steamwar.sql.SteamwarUserTable
|
||||
import de.steamwar.sql.Team
|
||||
import org.jetbrains.exposed.v1.core.eq
|
||||
import org.jetbrains.exposed.v1.core.like
|
||||
|
||||
class UserSearchCommand : CliktCommand("search") {
|
||||
val query by argument().help("Name, Id, UUID or DiscordId")
|
||||
|
||||
override val printHelpOnEmptyArgs = true
|
||||
|
||||
override fun help(context: Context): String = "Search for users"
|
||||
|
||||
override fun run() = useDb {
|
||||
val users = SteamwarUser.find {
|
||||
joinedOr(
|
||||
SteamwarUserTable.username like "%$query%",
|
||||
SteamwarUserTable.uuid like "%$query%",
|
||||
query.toLongOrNull()?.let { SteamwarUserTable.discordId eq it },
|
||||
query.toIntOrNull()?.let { SteamwarUserTable.id eq it }
|
||||
)
|
||||
}
|
||||
|
||||
val teams = mutableMapOf<Int, Team>()
|
||||
|
||||
echo(table {
|
||||
header { row("Id", "Username", "UUID", "Team", "DiscordId") }
|
||||
body {
|
||||
users.map { row(it.id.value, it.userName, it.uuid, teams.computeIfAbsent(it.team) { teamId -> Team.byId(teamId) }.teamName, it.discordId) }
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
package de.steamwar.db
|
||||
|
||||
import com.github.ajalt.clikt.core.BaseCliktCommand
|
||||
import com.github.ajalt.clikt.core.CliktError
|
||||
import de.steamwar.sql.SteamwarUser
|
||||
import de.steamwar.sql.SteamwarUserTable
|
||||
import org.jetbrains.exposed.v1.core.Expression
|
||||
import org.jetbrains.exposed.v1.core.Op
|
||||
import org.jetbrains.exposed.v1.core.eq
|
||||
import org.jetbrains.exposed.v1.core.or
|
||||
import org.jetbrains.exposed.v1.jdbc.Database
|
||||
import org.jetbrains.exposed.v1.jdbc.JdbcTransaction
|
||||
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
|
||||
import java.io.File
|
||||
import java.sql.ResultSet
|
||||
import java.util.Properties
|
||||
|
||||
object Database {
|
||||
lateinit var host: String
|
||||
lateinit var port: String
|
||||
lateinit var database: String
|
||||
lateinit var db: Database
|
||||
|
||||
fun ensureConnected() {
|
||||
if (::db.isInitialized) {
|
||||
return
|
||||
}
|
||||
val config = File(System.getProperty("user.home"), "mysql.properties")
|
||||
|
||||
if (!config.exists()) {
|
||||
throw CliktError("Config file not found!")
|
||||
}
|
||||
|
||||
val props = Properties();
|
||||
|
||||
props.load(config.inputStream())
|
||||
|
||||
host = props.getProperty("host")
|
||||
port = props.getProperty("port")
|
||||
database = props.getProperty("database")
|
||||
|
||||
val username = props.getProperty("user")
|
||||
val password = props.getProperty("password")
|
||||
|
||||
val url = "jdbc:mariadb://$host:$port/$database"
|
||||
|
||||
db = Database.connect(url, driver = "org.mariadb.jdbc.Driver", user = username, password = password)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
fun <T: BaseCliktCommand<T>> BaseCliktCommand<T>.findUser(query: String): SteamwarUser? = transaction {
|
||||
SteamwarUser.find { joinedOr(query.toIntOrNull()?.let { SteamwarUserTable.id eq it }, (SteamwarUserTable.username eq query), SteamwarUserTable.uuid eq query, query.toLongOrNull()?.let { SteamwarUserTable.discordId eq it }) }
|
||||
.firstOrNull()
|
||||
?.let { return@transaction it }
|
||||
}
|
||||
|
||||
fun joinedOr(vararg expressions: Expression<Boolean>?): Op<Boolean> =
|
||||
expressions.filterNotNull().reduce { acc, expression -> acc or expression } as Op<Boolean>
|
||||
|
||||
|
||||
fun <T> JdbcTransaction.execute(sql: String, transform: (ResultSet) -> T): List<T> {
|
||||
val result = mutableListOf<T>()
|
||||
exec(sql) { rs ->
|
||||
while (rs.next()) {
|
||||
result += transform(rs)
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
fun <T> JdbcTransaction.executeSingle(sql: String, transform: (ResultSet) -> T): T? {
|
||||
return execute(sql) { rs ->
|
||||
if (!rs.next()) {
|
||||
return@execute null
|
||||
}
|
||||
transform(rs)
|
||||
}.single()
|
||||
}
|
||||
|
||||
fun useDb(statement: JdbcTransaction.() -> Unit) {
|
||||
de.steamwar.db.Database.ensureConnected()
|
||||
transaction(de.steamwar.db.Database.db, statement)
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<configuration>
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="WARN">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -28,11 +28,11 @@ import org.jetbrains.exposed.v1.javatime.timestamp
|
||||
import java.time.Instant
|
||||
|
||||
object AuditLogTable: IntIdTable("AuditLog", "AuditLogId") {
|
||||
val time = timestamp("Time").index()
|
||||
val server = varchar("ServerName", 255).index()
|
||||
val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable().index()
|
||||
val actor = reference("Actor", SteamwarUserTable).index()
|
||||
val action = enumerationByName("ActionType", 255, AuditLog.Type::class).index()
|
||||
val time = timestamp("Time")
|
||||
val server = varchar("ServerName", 255)
|
||||
val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable()
|
||||
val actor = reference("Actor", SteamwarUserTable)
|
||||
val action = enumerationByName("ActionType", 255, AuditLog.Type::class)
|
||||
val actionText = text("ActionText")
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -33,8 +33,8 @@ import java.sql.Timestamp
|
||||
import java.time.Instant
|
||||
|
||||
object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
|
||||
val userId = reference("UserID", SteamwarUserTable).index()
|
||||
val timestamp = timestamp("Timestamp").index()
|
||||
val userId = reference("UserID", SteamwarUserTable)
|
||||
val timestamp = timestamp("Timestamp")
|
||||
val ip = varchar("IP", 45).entityId()
|
||||
|
||||
init {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
||||
import java.util.*
|
||||
|
||||
object BauweltMemberTable: CompositeIdTable("BauweltMember") {
|
||||
val bauweltId = reference("BauweltID", SteamwarUserTable).index()
|
||||
val memberId = reference("MemberID", SteamwarUserTable).index()
|
||||
val bauweltId = reference("BauweltID", SteamwarUserTable)
|
||||
val memberId = reference("MemberID", SteamwarUserTable)
|
||||
val build = bool("Build")
|
||||
val worldEdit = bool("WorldEdit")
|
||||
val world = bool("World")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -20,7 +20,6 @@
|
||||
package de.steamwar.sql
|
||||
|
||||
import de.steamwar.sql.internal.useDb
|
||||
import org.jetbrains.exposed.v1.core.ReferenceOption
|
||||
import org.jetbrains.exposed.v1.core.SortOrder
|
||||
import org.jetbrains.exposed.v1.core.and
|
||||
import org.jetbrains.exposed.v1.core.dao.id.CompositeID
|
||||
@@ -35,23 +34,19 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
||||
import java.sql.Timestamp
|
||||
|
||||
object CheckedSchematicTable: CompositeIdTable("CheckedSchematic") {
|
||||
val nodeId = optReference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL, onUpdate = ReferenceOption.SET_NULL).index()
|
||||
val nodeOwner = reference("NodeOwner", SteamwarUserTable).index()
|
||||
val nodeName = varchar("NodeName", 64).entityId().index()
|
||||
val validator = reference("Validator", SteamwarUserTable).index()
|
||||
val startTime = timestamp("StartTime").entityId().index()
|
||||
val nodeId = optReference("NodeId", SchematicNodeTable)
|
||||
val nodeOwner = reference("NodeOwner", SteamwarUserTable)
|
||||
val nodeName = varchar("NodeName", 64).entityId()
|
||||
val validator = reference("Validator", SteamwarUserTable)
|
||||
val startTime = timestamp("StartTime").entityId()
|
||||
val endTime = timestamp("EndTime")
|
||||
val declineReason = text("DeclineReason")
|
||||
val seen = bool("Seen").index()
|
||||
val seen = bool("Seen")
|
||||
val nodeType = varchar("NodeType", 16)
|
||||
|
||||
init {
|
||||
addIdColumn(nodeOwner)
|
||||
addIdColumn(nodeName)
|
||||
|
||||
index(false, nodeOwner, endTime)
|
||||
index(false, startTime, endTime, nodeName)
|
||||
index(false, seen, nodeOwner, startTime)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -36,8 +36,8 @@ import java.time.Instant
|
||||
object EventTable : IntIdTable("Event", "EventId") {
|
||||
val name = varchar("EventName", 100).uniqueIndex()
|
||||
val deadline = timestamp("Deadline")
|
||||
val start = timestamp("Start").index()
|
||||
val end = timestamp("End").index()
|
||||
val start = timestamp("Start")
|
||||
val end = timestamp("End")
|
||||
val maxPlayers = integer("MaximumTeamMembers")
|
||||
val schemType = varchar("SchemType", 16).nullable()
|
||||
val publicsOnly = bool("PublicSchemsOnly")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -33,17 +33,17 @@ import java.time.Instant
|
||||
import java.util.*
|
||||
|
||||
object EventFightTable : IntIdTable("EventFight", "FightID") {
|
||||
val eventId = reference("EventID", EventTable).index()
|
||||
val startTime = timestamp("StartTime").index()
|
||||
val eventId = reference("EventID", EventTable)
|
||||
val startTime = timestamp("StartTime")
|
||||
val gamemode = text("Spielmodus")
|
||||
val map = text("Map")
|
||||
val groupId = optReference("GroupId", EventGroupTable).index()
|
||||
val teamBlue = reference("TeamBlue", TeamTable).index()
|
||||
val teamRed = reference("TeamRed", TeamTable).index()
|
||||
val groupId = optReference("GroupId", EventGroupTable)
|
||||
val teamBlue = reference("TeamBlue", TeamTable)
|
||||
val teamRed = reference("TeamRed", TeamTable)
|
||||
val spectatePort = integer("SpectatePort").nullable()
|
||||
val bestOf = integer("BestOf")
|
||||
val ergebnis = integer("Ergebnis")
|
||||
val fight = optReference("Fight", FightTable).index()
|
||||
val fight = optReference("Fight", FightTable)
|
||||
}
|
||||
|
||||
class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {
|
||||
|
||||
@@ -34,10 +34,6 @@ object EventGroupTable : IntIdTable("EventGroup", "Id") {
|
||||
val pointsPerWin = integer("PointsPerWin").default(3)
|
||||
val pointsPerLoss = integer("PointsPerLoss").default(0)
|
||||
val pointsPerDraw = integer("PointsPerDraw").default(1)
|
||||
|
||||
init {
|
||||
uniqueIndex(event, name)
|
||||
}
|
||||
}
|
||||
|
||||
class EventGroup(id: EntityID<Int>) : IntEntity(id) {
|
||||
@@ -94,7 +90,7 @@ class EventGroup(id: EntityID<Int>) : IntEntity(id) {
|
||||
set(value) {
|
||||
groupPointsPerDraw = value
|
||||
}
|
||||
val dependents by lazy { EventRelation.getGroupRelations(this) }
|
||||
val dependents by lazy { EventRelation.getGroupRelations(this).toList() }
|
||||
val lastFight by lazy { Optional.ofNullable(fights.maxByOrNull { it.startTime }) }
|
||||
|
||||
fun getId() = id.value
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||
import org.jetbrains.exposed.v1.jdbc.select
|
||||
|
||||
object EventRelationTable : IntIdTable("EventRelation") {
|
||||
val fightId = reference("FightId", EventFightTable).index()
|
||||
val fightId = reference("FightId", EventFightTable)
|
||||
val fightTeam = enumeration("FightTeam", EventRelation.FightTeam::class)
|
||||
val fromType = enumeration("FromType", EventRelation.FromType::class)
|
||||
val fromId = integer("FromId")
|
||||
@@ -51,11 +51,11 @@ class EventRelation(id: EntityID<Int>) : IntEntity(id) {
|
||||
|
||||
@JvmStatic
|
||||
fun getFightRelations(fight: EventFight) =
|
||||
useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) }.toList() }
|
||||
useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) } }
|
||||
|
||||
@JvmStatic
|
||||
fun getGroupRelations(group: EventGroup) =
|
||||
useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) }.toList() }
|
||||
useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) } }
|
||||
|
||||
@JvmStatic
|
||||
fun create(fight: EventFight, fightTeam: FightTeam, fromType: FromType, fromId: Int, fromPlace: Int) = useDb {
|
||||
|
||||
@@ -34,14 +34,14 @@ import org.jetbrains.exposed.v1.jdbc.update
|
||||
import java.sql.Timestamp
|
||||
|
||||
object FightTable : IntIdTable("Fight", "FightId") {
|
||||
val gamemode = varchar("Gamemode", 30).index()
|
||||
val gamemode = varchar("Gamemode", 30)
|
||||
val server = text("Server")
|
||||
val startTime = timestamp("StartTime")
|
||||
val duration = integer("Duration")
|
||||
val blueLeader = reference("BlueLeader", SteamwarUserTable).index()
|
||||
val redLeader = reference("RedLeader", SteamwarUserTable).index()
|
||||
val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
|
||||
val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
|
||||
val blueLeader = reference("BlueLeader", SteamwarUserTable)
|
||||
val redLeader = reference("RedLeader", SteamwarUserTable)
|
||||
val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
|
||||
val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
|
||||
val win = enumeration("Win", Fight.WinningTeam::class)
|
||||
val winCondition = varchar("WinCondition", 100)
|
||||
val replayAvailable = bool("ReplayAvailable")
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
||||
|
||||
object FightPlayerTable : CompositeIdTable("FightPlayer") {
|
||||
val fightId = reference("FightId", FightTable)
|
||||
val userId = reference("UserId", SteamwarUserTable).index()
|
||||
val userId = reference("UserId", SteamwarUserTable)
|
||||
val team = integer("Team")
|
||||
val kit = varchar("Kit", 64)
|
||||
val kills = integer("Kills")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -30,7 +30,6 @@ import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@ToString
|
||||
public final class GameModeConfig<M, W> {
|
||||
@@ -53,10 +52,6 @@ public final class GameModeConfig<M, W> {
|
||||
private static final Map<String, GameModeConfig<?, String>> byGameName;
|
||||
private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType;
|
||||
|
||||
public static <M> Collection<GameModeConfig<M, String>> getAll() {
|
||||
return (Collection) byFileName.values();
|
||||
}
|
||||
|
||||
public static <M> GameModeConfig<M, String> getByFileName(File file) {
|
||||
return (GameModeConfig<M, String>) byFileName.get(file.getName());
|
||||
}
|
||||
@@ -92,24 +87,8 @@ public final class GameModeConfig<M, W> {
|
||||
byFileName = new HashMap<>();
|
||||
byGameName = new HashMap<>();
|
||||
bySchematicType = new HashMap<>();
|
||||
SchematicType.values();
|
||||
DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
|
||||
init();
|
||||
}
|
||||
|
||||
public static void init() {
|
||||
byFileName.clear();
|
||||
byGameName.clear();
|
||||
bySchematicType.clear();
|
||||
|
||||
File folder = SQLWrapper.impl.getSchemTypesFolder();
|
||||
if (!folder.exists()) return;
|
||||
if (!folder.isDirectory()) return;
|
||||
|
||||
for (File file : Objects.requireNonNull(folder.listFiles())) {
|
||||
if (!file.getName().endsWith(".yml")) continue;
|
||||
if (file.getName().endsWith(".kits.yml")) continue;
|
||||
SQLWrapper.impl.loadGameModeConfig(file);
|
||||
}
|
||||
|
||||
byFileName.values().forEach(gameModeConfig -> {
|
||||
List<SchematicType> subTypes = Collections.unmodifiableList(gameModeConfig.Schematic.SubTypesStrings.stream()
|
||||
@@ -692,9 +671,9 @@ public final class GameModeConfig<M, W> {
|
||||
loaded = loader.canLoad();
|
||||
Size = new SizeConfig(loader.with("Size"));
|
||||
Inset = new InsetConfig(loader.with("Inset"));
|
||||
Type = null;
|
||||
Type = loader.getSchematicType("Type", "Normal");
|
||||
SubTypesStrings = loader.getStringList("SubTypes");
|
||||
SubTypes = new ArrayList<>();
|
||||
SubTypes = loader.getSchematicTypeList("SubTypes");
|
||||
Shortcut = loader.getString("Shortcut", "");
|
||||
Material = loader.getMaterial("Material", "STONE_BUTTON");
|
||||
ManualCheck = loader.getBoolean("ManualCheck", true);
|
||||
@@ -711,26 +690,13 @@ public final class GameModeConfig<M, W> {
|
||||
Map<Set<M>, Integer> Limited = new HashMap<>();
|
||||
for (Map<?, ?> entry : loader.getMapList("Limited")) {
|
||||
int amount = (Integer) entry.get("Amount");
|
||||
Set<M> materials = Stream.of((List<String>) entry.get("Materials"))
|
||||
.filter(Objects::nonNull)
|
||||
.flatMap(List::stream)
|
||||
.map(String::toUpperCase)
|
||||
.map(material -> {
|
||||
try {
|
||||
return loader.materialMapper.apply(material);
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
})
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
|
||||
if (amount == 0) {
|
||||
materials.forEach(material -> {
|
||||
Limited.put(Collections.singleton(material), 0);
|
||||
Limited.put(Collections.singleton(loader.materialMapper.apply(material.toUpperCase())), 0);
|
||||
});
|
||||
} else {
|
||||
Limited.put(materials, amount);
|
||||
Limited.put(Collections.unmodifiableSet(materials.stream().map(String::toUpperCase).map(loader.materialMapper).collect(Collectors.toSet())), amount);
|
||||
}
|
||||
}
|
||||
SQLWrapper.impl.getMaterialWithGreaterBlastResistance(MaxBlastResistance).forEach(material -> {
|
||||
|
||||
@@ -30,8 +30,8 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||
import java.util.*
|
||||
|
||||
object IgnoreSystemTable: CompositeIdTable("IgnoredPlayers") {
|
||||
val ignorer = reference("Ignorer", SteamwarUserTable).index()
|
||||
val ignored = reference("Ignored", SteamwarUserTable).index()
|
||||
val ignorer = reference("Ignorer", SteamwarUserTable)
|
||||
val ignored = reference("Ignored", SteamwarUserTable)
|
||||
|
||||
override val primaryKey = PrimaryKey(ignorer, ignored)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
|
||||
@@ -35,7 +35,7 @@ import java.io.InputStream
|
||||
import java.util.zip.GZIPInputStream
|
||||
|
||||
object NodeDataTable: CompositeIdTable("NodeData") {
|
||||
val nodeId = reference("NodeId", SchematicNodeTable).index()
|
||||
val nodeId = reference("NodeId", SchematicNodeTable)
|
||||
val createdAt = timestamp("CreatedAt").defaultExpression(CurrentTimestamp).entityId()
|
||||
val nodeFormat = enumeration("NodeFormat", NodeData.SchematicFormat::class)
|
||||
val schemData = blob("SchemData")
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
package de.steamwar.sql
|
||||
|
||||
import de.steamwar.sql.internal.useDb
|
||||
import org.jetbrains.exposed.v1.core.ReferenceOption
|
||||
import org.jetbrains.exposed.v1.core.dao.id.EntityID
|
||||
import org.jetbrains.exposed.v1.core.dao.id.IdTable
|
||||
import org.jetbrains.exposed.v1.core.eq
|
||||
@@ -33,8 +32,8 @@ import java.sql.Timestamp
|
||||
import java.time.Instant
|
||||
|
||||
object NodeDownloadTable: IdTable<Int>("NodeDownload") {
|
||||
override val id = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE).uniqueIndex()
|
||||
val link = varchar("Link", 255).uniqueIndex()
|
||||
override val id = reference("NodeId", SchematicNodeTable).uniqueIndex()
|
||||
val link = varchar("Link", 255)
|
||||
val timestamp = timestamp("Timestamp").defaultExpression(CurrentTimestamp)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -20,7 +20,6 @@
|
||||
package de.steamwar.sql
|
||||
|
||||
import de.steamwar.sql.internal.useDb
|
||||
import org.jetbrains.exposed.v1.core.ReferenceOption
|
||||
import org.jetbrains.exposed.v1.core.and
|
||||
import org.jetbrains.exposed.v1.core.dao.id.CompositeID
|
||||
import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
|
||||
@@ -33,9 +32,9 @@ import java.util.*
|
||||
import kotlin.jvm.optionals.getOrNull
|
||||
|
||||
object NodeMemberTable : CompositeIdTable("NodeMember") {
|
||||
val node = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE, onUpdate = ReferenceOption.CASCADE).index()
|
||||
val userId = reference("UserId", SteamwarUserTable).index()
|
||||
val parentNode = optReference("ParentId", SchematicNodeTable).index()
|
||||
val node = reference("NodeId", SchematicNodeTable)
|
||||
val userId = reference("UserId", SteamwarUserTable)
|
||||
val parentNode = optReference("ParentId", SchematicNodeTable)
|
||||
|
||||
override val primaryKey = PrimaryKey(node, userId)
|
||||
|
||||
@@ -95,7 +94,7 @@ class NodeMember(id: EntityID<CompositeID>) : CompositeEntity(id) {
|
||||
{ Optional.ofNullable(it?.value) })
|
||||
private set
|
||||
|
||||
fun setParentId(id: Int?) = useDb {
|
||||
fun setParentId(id: Int?) {
|
||||
parent = Optional.ofNullable(id)
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,6 @@ object PersonalKitTable: CompositeIdTable("PersonalKit") {
|
||||
|
||||
init {
|
||||
addIdColumn(userId)
|
||||
index(false, userId, gamemode)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -34,16 +34,12 @@ import java.util.function.Consumer
|
||||
|
||||
object PunishmentTable : IntIdTable("Punishments", "PunishmentId") {
|
||||
val userId = reference("UserId", SteamwarUserTable)
|
||||
val punisher = reference("Punisher", SteamwarUserTable).index()
|
||||
val punisher = reference("Punisher", SteamwarUserTable)
|
||||
val type = enumerationByName("Type", 32, Punishment.PunishmentType::class)
|
||||
val startTime = timestamp("StartTime")
|
||||
val endTime = timestamp("EndTime")
|
||||
val perma = bool("Perma")
|
||||
val reason = text("Reason")
|
||||
|
||||
init {
|
||||
index(false, userId, type)
|
||||
}
|
||||
}
|
||||
|
||||
class Punishment(id: EntityID<Int>) : IntEntity(id) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||
|
||||
object RefereeTable: CompositeIdTable("Referee") {
|
||||
val eventId = reference("EventId", EventTable)
|
||||
val userId = reference("UserId", SteamwarUserTable).index()
|
||||
val userId = reference("UserId", SteamwarUserTable)
|
||||
|
||||
override val primaryKey = PrimaryKey(eventId, userId)
|
||||
|
||||
|
||||
@@ -36,5 +36,8 @@ public interface SQLWrapper<M> {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
|
||||
}
|
||||
|
||||
void additionalExceptionMetadata(StringBuilder builder);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -34,17 +34,13 @@ import java.util.*
|
||||
import java.util.function.Consumer
|
||||
|
||||
object SchematicNodeTable : IntIdTable("SchematicNode", "NodeId") {
|
||||
val owner = reference("NodeOwner", SteamwarUserTable).index()
|
||||
val owner = reference("NodeOwner", SteamwarUserTable)
|
||||
val name = varchar("NodeName", 64)
|
||||
val parent = optReference("ParentNode", SchematicNodeTable).index()
|
||||
val parent = optReference("ParentNode", SchematicNodeTable)
|
||||
val lastUpdate = timestamp("LastUpdate").defaultExpression(CurrentTimestamp)
|
||||
val item = text("NodeItem")
|
||||
val type = varchar("NodeType", 16).nullable().index()
|
||||
val type = varchar("NodeType", 16).nullable()
|
||||
val config = integer("Config")
|
||||
|
||||
init {
|
||||
uniqueIndex(parent, owner, name)
|
||||
}
|
||||
}
|
||||
|
||||
class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
|
||||
|
||||
@@ -19,7 +19,11 @@
|
||||
|
||||
package de.steamwar.sql
|
||||
|
||||
import java.io.File
|
||||
import java.util.*
|
||||
import java.util.Locale
|
||||
import java.util.Locale.getDefault
|
||||
import java.util.stream.Collectors
|
||||
|
||||
data class SchematicType(
|
||||
val name: String,
|
||||
@@ -43,65 +47,58 @@ data class SchematicType(
|
||||
@JvmField
|
||||
val Normal = SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false)
|
||||
|
||||
private val types: MutableList<SchematicType> = mutableListOf()
|
||||
private val fromDB: MutableMap<String, SchematicType> = mutableMapOf()
|
||||
private val types: List<SchematicType>
|
||||
private val fromDB: Map<String, SchematicType>?
|
||||
|
||||
init {
|
||||
GameModeConfig.init()
|
||||
init()
|
||||
}
|
||||
val tmpTypes = mutableListOf<SchematicType>()
|
||||
val tmpFromDB = mutableMapOf<String, SchematicType>()
|
||||
|
||||
@JvmStatic
|
||||
fun init() {
|
||||
types.clear()
|
||||
fromDB.clear()
|
||||
tmpTypes.add(Normal)
|
||||
tmpFromDB[Normal.toDB()] = Normal
|
||||
|
||||
types.add(Normal)
|
||||
fromDB[Normal.toDB()] = Normal
|
||||
|
||||
for (gameModeConfig in GameModeConfig.getAll<Any>()) {
|
||||
val type = gameModeConfig.Schematic.Type
|
||||
?: continue
|
||||
if (fromDB.containsKey(type.toDB())) continue
|
||||
|
||||
types.add(type)
|
||||
fromDB[type.toDB()] = type
|
||||
if (gameModeConfig.CheckQuestions.isNotEmpty() && type.checkType != null) {
|
||||
types.add(type.checkType)
|
||||
fromDB[type.checkType.toDB()] = type.checkType
|
||||
val folder = SQLWrapper.impl.schemTypesFolder
|
||||
if (folder.exists()) {
|
||||
for (configFile in Arrays.stream<File?>(folder.listFiles { _, name ->
|
||||
name.endsWith(
|
||||
".yml"
|
||||
) && !name.endsWith(".kits.yml")
|
||||
}).sorted().collect(Collectors.toList())) {
|
||||
val gameModeConfig = SQLWrapper.impl.loadGameModeConfig(configFile)
|
||||
if (gameModeConfig.Schematic.Type == null) continue
|
||||
if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue
|
||||
val current = gameModeConfig.Schematic.Type
|
||||
if (gameModeConfig.CheckQuestions.isNotEmpty()) {
|
||||
val checkType = current.checkType
|
||||
tmpTypes.add(checkType!!)
|
||||
tmpFromDB[checkType.toDB()] = checkType
|
||||
}
|
||||
tmpTypes.add(current)
|
||||
tmpFromDB[current.toDB()] = current
|
||||
SQLWrapper.impl.processSchematicType(gameModeConfig)
|
||||
}
|
||||
}
|
||||
|
||||
types = tmpTypes.toList()
|
||||
fromDB = tmpFromDB.toMap()
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun values() =
|
||||
types
|
||||
fun values() = types
|
||||
|
||||
@JvmStatic
|
||||
fun fromDB(value: String) =
|
||||
fromDB[value.lowercase()]
|
||||
fun fromDB(value: String) = fromDB?.let { it[value.lowercase()] }
|
||||
}
|
||||
|
||||
fun name() =
|
||||
name
|
||||
fun name() = name
|
||||
fun toDB() = name.lowercase()
|
||||
|
||||
fun toDB() =
|
||||
name.lowercase()
|
||||
fun check() = type == Type.CHECK_TYPE
|
||||
fun fightType() = type == Type.FIGHT_TYPE
|
||||
fun writeable() = type == Type.NORMAL
|
||||
|
||||
fun check() =
|
||||
type == Type.CHECK_TYPE
|
||||
|
||||
fun fightType() =
|
||||
type == Type.FIGHT_TYPE
|
||||
|
||||
fun writeable() =
|
||||
type == Type.NORMAL
|
||||
|
||||
fun checkType() =
|
||||
if (manualCheck) checkType else this
|
||||
|
||||
fun isAssignable() =
|
||||
type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
|
||||
fun checkType() = if (manualCheck) checkType else this
|
||||
fun isAssignable() = type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
|
||||
|
||||
enum class Type {
|
||||
NORMAL,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -28,13 +28,9 @@ import org.jetbrains.exposed.v1.dao.IntEntity
|
||||
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||
|
||||
object ScriptTable: IntIdTable("Script") {
|
||||
val userId = reference("UserId", SteamwarUserTable).index()
|
||||
val userId = reference("UserId", SteamwarUserTable)
|
||||
val name = varchar("Name", 64)
|
||||
val code = text("Code")
|
||||
|
||||
init {
|
||||
uniqueIndex(userId, name)
|
||||
}
|
||||
}
|
||||
|
||||
class Script(id: EntityID<Int>) : IntEntity(id) {
|
||||
|
||||
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
|
||||
import java.sql.Timestamp
|
||||
|
||||
object SessionTable: Table("Session") {
|
||||
val userId = reference("UserId", SteamwarUserTable).index()
|
||||
val userId = reference("UserId", SteamwarUserTable)
|
||||
val startTime = timestamp("StartTime")
|
||||
val endTime = timestamp("EndTime").defaultExpression(CurrentTimestamp)
|
||||
}
|
||||
|
||||
@@ -37,15 +37,15 @@ import javax.crypto.SecretKeyFactory
|
||||
import javax.crypto.spec.PBEKeySpec
|
||||
|
||||
object SteamwarUserTable : IntIdTable("UserData", "id") {
|
||||
val uuid = varchar("UUID", 36).uniqueIndex()
|
||||
val username = varchar("UserName", 32).index()
|
||||
val team = reference("Team", TeamTable).index()
|
||||
val uuid = varchar("UUID", 36)
|
||||
val username = varchar("UserName", 32)
|
||||
val team = reference("Team", TeamTable)
|
||||
val leader = bool("Leader")
|
||||
val locale = varchar("Locale", 16).nullable()
|
||||
val manualLocale = bool("ManualLocale")
|
||||
val bedrock = bool("Bedrock")
|
||||
val password = text("Password").nullable()
|
||||
val discordId = long("DiscordId").nullable().uniqueIndex()
|
||||
val discordId = long("DiscordId").nullable()
|
||||
}
|
||||
|
||||
class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
|
||||
|
||||
@@ -28,9 +28,9 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||
import org.jetbrains.exposed.v1.jdbc.select
|
||||
|
||||
object TeamTable : IntIdTable("Team", "TeamID") {
|
||||
val kuerzel = varchar("TeamKuerzel", 10).index()
|
||||
val kuerzel = varchar("TeamKuerzel", 10)
|
||||
val color = char("TeamColor", 1).default("8")
|
||||
val name = varchar("TeamName", 16).index()
|
||||
val name = varchar("TeamName", 16)
|
||||
val deleted = bool("TeamDeleted").default(false)
|
||||
}
|
||||
|
||||
|
||||
@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.deleteWhere
|
||||
import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
||||
|
||||
object TeamTeilnahmeTable : CompositeIdTable("TeamTeilnahme") {
|
||||
val teamId = reference("teamId", TeamTable).index()
|
||||
val eventId = reference("eventId", EventTable).index()
|
||||
val teamId = reference("teamId", TeamTable)
|
||||
val eventId = reference("eventId", EventTable)
|
||||
val placement = integer("Placement").nullable()
|
||||
|
||||
override val primaryKey = PrimaryKey(teamId, eventId)
|
||||
|
||||
@@ -33,10 +33,10 @@ import java.sql.Timestamp
|
||||
import java.util.*
|
||||
|
||||
object TokenTable: IntIdTable("Token") {
|
||||
val name = varchar("Name", 64).uniqueIndex()
|
||||
val owner = reference("Owner", SteamwarUserTable).index()
|
||||
val name = varchar("Name", 64)
|
||||
val owner = reference("Owner", SteamwarUserTable)
|
||||
val created = timestamp("Created").defaultExpression(CurrentTimestamp)
|
||||
val hash = varchar("Hash", 88).uniqueIndex()
|
||||
val hash = varchar("Hash", 88)
|
||||
}
|
||||
|
||||
class Token(id: EntityID<Int>): IntEntity(id) {
|
||||
|
||||
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
|
||||
import org.jetbrains.exposed.v1.jdbc.selectAll
|
||||
|
||||
object UserPermTable: Table("UserPerm") {
|
||||
val user = reference("User", SteamwarUserTable.id).index()
|
||||
val user = reference("User", SteamwarUserTable.id)
|
||||
val perm = enumerationByName("Perm", 32, UserPerm::class)
|
||||
|
||||
override val primaryKey = PrimaryKey(user, perm)
|
||||
|
||||
@@ -67,7 +67,7 @@ object KotlinDatabase {
|
||||
}
|
||||
}
|
||||
|
||||
fun <T> useDb(statement: JdbcTransaction.() -> T): T {
|
||||
fun <T: Any?> useDb(statement: JdbcTransaction.() -> T): T {
|
||||
KotlinDatabase.ensureConnected()
|
||||
return TransactionManager.currentOrNull()?.statement() ?: transaction(KotlinDatabase.db) {
|
||||
statement()
|
||||
|
||||
@@ -42,5 +42,4 @@ dependencies {
|
||||
|
||||
compileOnly(libs.fastutil)
|
||||
compileOnly(libs.authlib)
|
||||
compileOnly(project(":FightSystem:FightSystem_14"))
|
||||
}
|
||||
|
||||
-51
@@ -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.fightsystem.listener;
|
||||
|
||||
import de.steamwar.fightsystem.Config;
|
||||
import de.steamwar.fightsystem.states.FightState;
|
||||
import de.steamwar.fightsystem.states.StateDependentTask;
|
||||
import net.minecraft.world.entity.projectile.windcharge.WindCharge;
|
||||
import org.bukkit.Location;
|
||||
|
||||
public class WindchargeStopper21 implements WindchargeStopper.IWindchargeStopper {
|
||||
|
||||
public WindchargeStopper21() {
|
||||
new StateDependentTask(true, FightState.Running, this::run, 1, 1);
|
||||
}
|
||||
|
||||
private static final int middleLine = Config.SpecSpawn.getBlockZ();
|
||||
|
||||
private static final Class<?> windChargeClass = WindCharge.class;
|
||||
|
||||
private void run() {
|
||||
Recording.iterateOverEntities(windChargeClass::isInstance, entity -> {
|
||||
Location location = entity.getLocation();
|
||||
Location prevLocation = location.clone().subtract(entity.getVelocity());
|
||||
|
||||
boolean passedMiddle = location.getBlockZ() > middleLine && prevLocation.getBlockZ() > middleLine ||
|
||||
location.getBlockZ() < middleLine && prevLocation.getBlockZ() < middleLine;
|
||||
|
||||
if(!passedMiddle) {
|
||||
entity.remove();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,29 +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.fightsystem.utils;
|
||||
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public class FlatteningWrapper21 extends FlatteningWrapper14 {
|
||||
@Override
|
||||
public boolean hasAttributeModifier(ItemStack stack) {
|
||||
return stack.hasItemMeta() && stack.getItemMeta() != null && stack.getItemMeta().hasAttributeModifiers();
|
||||
}
|
||||
}
|
||||
@@ -38,27 +38,6 @@ public class ReflectionWrapper21 implements ReflectionWrapper {
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
|
||||
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.ATTRIBUTE_MODIFIERS);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.TOOL);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.WEAPON);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.FOOD);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.CONSUMABLE);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.POTION_CONTENTS);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.STORED_ENCHANTMENTS);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.CAN_BREAK);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.CAN_PLACE_ON);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.MAX_DAMAGE);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.USE_REMAINDER);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.USE_COOLDOWN);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.CHARGED_PROJECTILES);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.INTANGIBLE_PROJECTILE);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORKS);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORK_EXPLOSION);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.EQUIPPABLE);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.REPAIR_COST);
|
||||
FORBIDDEN_TYPES.add(DataComponentTypes.ENCHANTABLE);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
-23
@@ -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.fightsystem.listener;
|
||||
|
||||
public class WindchargeStopper8 implements WindchargeStopper.IWindchargeStopper {
|
||||
}
|
||||
@@ -98,12 +98,10 @@ public class FightSystem extends JavaPlugin {
|
||||
new StateDependentListener(ArenaMode.All, FightState.All, BountifulWrapper.impl.newDenyArrowPickupListener());
|
||||
new OneShotStateDependent(ArenaMode.All, FightState.PreSchemSetup, () -> Fight.playSound(SWSound.BLOCK_NOTE_PLING.getSound(), 100.0f, 2.0f));
|
||||
new OneShotStateDependent(ArenaMode.Test, FightState.All, WorldEditRendererCUIEditor::new);
|
||||
if (Core.getVersion() >= 19) {
|
||||
try {
|
||||
Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, ArenaMode.AntiTest.contains(Config.mode));
|
||||
} catch (Exception e) {
|
||||
// Ignore if failed!
|
||||
}
|
||||
try {
|
||||
Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, ArenaMode.AntiTest.contains(Config.mode));
|
||||
} catch (Exception e) {
|
||||
// Ignore if failed!
|
||||
}
|
||||
|
||||
techHider = new TechHiderWrapper();
|
||||
|
||||
@@ -23,14 +23,12 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import de.steamwar.fightsystem.ArenaMode;
|
||||
import de.steamwar.fightsystem.Config;
|
||||
import de.steamwar.fightsystem.FightSystem;
|
||||
import de.steamwar.fightsystem.fight.Fight;
|
||||
import de.steamwar.fightsystem.fight.FightTeam;
|
||||
import de.steamwar.fightsystem.fight.JoinRequest;
|
||||
import de.steamwar.fightsystem.listener.Chat;
|
||||
import de.steamwar.fightsystem.record.GlobalRecorder;
|
||||
import de.steamwar.fightsystem.states.FightState;
|
||||
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
||||
import de.steamwar.fightsystem.utils.Region;
|
||||
import de.steamwar.sql.SchematicNode;
|
||||
import de.steamwar.sql.SteamwarUser;
|
||||
import lombok.Getter;
|
||||
@@ -54,7 +52,6 @@ import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Villager;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.logging.Level;
|
||||
@@ -87,6 +84,8 @@ public abstract class AI {
|
||||
private final BukkitTask task;
|
||||
private final Queue<Action> queue = new ArrayDeque<>();
|
||||
|
||||
protected final NavMesh navMesh;
|
||||
|
||||
protected AI(FightTeam team, SteamwarUser user) {
|
||||
this.team = team;
|
||||
|
||||
@@ -98,6 +97,8 @@ public abstract class AI {
|
||||
ais.put(entity.getUniqueId(), this);
|
||||
team.addMember(entity, user);
|
||||
|
||||
navMesh = new NavMesh(team);
|
||||
|
||||
if(FightState.Schem.contains(FightState.getFightState()))
|
||||
Bukkit.getScheduler().runTask(FightSystem.getPlugin(), () -> schematic(team.getClipboard()));
|
||||
}
|
||||
@@ -134,58 +135,61 @@ public abstract class AI {
|
||||
Chat.broadcastChat("PARTICIPANT_CHAT", team.getColoredName(), entity.getName(), message);
|
||||
}
|
||||
|
||||
public Vector getPosition() {
|
||||
Location location = entity.getLocation();
|
||||
Region extend = team.getExtendRegion();
|
||||
if(Fight.getUnrotated() == team)
|
||||
return new Vector(
|
||||
location.getX() - extend.getMinX(),
|
||||
location.getY() - team.getSchemRegion().getMinY(),
|
||||
location.getZ() - extend.getMinZ()
|
||||
);
|
||||
else
|
||||
return new Vector(
|
||||
extend.getMaxX() - location.getX(),
|
||||
location.getY() - team.getSchemRegion().getMinY(),
|
||||
extend.getMaxZ() - location.getZ()
|
||||
);
|
||||
public LocalCoordinate getPosition() {
|
||||
return WorldCoordinate.from(entity.getLocation()).toLocal(team);
|
||||
}
|
||||
|
||||
public Material getBlock(Vector pos) {
|
||||
public Material getBlock(WorldCoordinate pos) {
|
||||
return getBlock(pos.toLocal(team));
|
||||
}
|
||||
|
||||
public Material getBlock(LocalCoordinate pos) {
|
||||
queue.add(new Action(1));
|
||||
return translate(pos).getBlock().getType();
|
||||
return pos.toWorld(team).toLocation(Config.world).getBlock().getType();
|
||||
}
|
||||
|
||||
public BlockData getBlockData(Vector pos) {
|
||||
public BlockData getBlockData(WorldCoordinate pos) {
|
||||
return getBlockData(pos.toLocal(team));
|
||||
}
|
||||
|
||||
public BlockData getBlockData(LocalCoordinate pos) {
|
||||
queue.add(new Action(1));
|
||||
return translate(pos).getBlock().getBlockData();
|
||||
return pos.toWorld(team).toLocation(Config.world).getBlock().getBlockData();
|
||||
}
|
||||
|
||||
public void setTNT(Vector pos) {
|
||||
public void setTNT(WorldCoordinate pos) {
|
||||
setTNT(pos.toLocal(team));
|
||||
}
|
||||
|
||||
public void setTNT(LocalCoordinate pos) {
|
||||
queue.add(new Action(1) {
|
||||
@Override
|
||||
public void run() {
|
||||
if(FightState.getFightState() != FightState.RUNNING)
|
||||
return;
|
||||
|
||||
Location location = translate(pos);
|
||||
Location location = pos.toWorld(team).toLocation(Config.world);
|
||||
if(interactionDistanceViolation(location)) {
|
||||
chat("InteractionDistanceViolation: setTNT");
|
||||
return;
|
||||
}
|
||||
|
||||
Block block = location.getBlock();
|
||||
if(block.getType() == Material.AIR)
|
||||
if(block.getType() == Material.AIR || block.getType() == Material.WATER || block.getType() == Material.LAVA || block.getType() == Material.TNT)
|
||||
block.setType(Material.TNT);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void interact(Vector pos) {
|
||||
public void interact(WorldCoordinate pos) {
|
||||
interact(pos.toLocal(team));
|
||||
}
|
||||
|
||||
public void interact(LocalCoordinate pos) {
|
||||
queue.add(new Action(1) {
|
||||
@Override
|
||||
public void run() {
|
||||
Location location = translate(pos);
|
||||
Location location = pos.toWorld(team).toLocation(Config.world);
|
||||
if(interactionDistanceViolation(location)) {
|
||||
chat("InteractionDistanceViolation: interact");
|
||||
return;
|
||||
@@ -196,11 +200,15 @@ public abstract class AI {
|
||||
});
|
||||
}
|
||||
|
||||
public void interact(Vector pos, int n) {
|
||||
public void interact(WorldCoordinate pos, int n) {
|
||||
interact(pos.toLocal(team), n);
|
||||
}
|
||||
|
||||
public void interact(LocalCoordinate pos, int n) {
|
||||
queue.add(new Action(1) {
|
||||
@Override
|
||||
public void run() {
|
||||
Location location = translate(pos);
|
||||
Location location = pos.toWorld(team).toLocation(Config.world);
|
||||
if (interactionDistanceViolation(location))
|
||||
return;
|
||||
Block block = location.getBlock();
|
||||
@@ -217,39 +225,75 @@ public abstract class AI {
|
||||
});
|
||||
}
|
||||
|
||||
public void move(Vector pos) {
|
||||
public MoveResult checkMove(WorldCoordinate target) {
|
||||
Location location = entity.getLocation();
|
||||
if(!entity.isOnGround() && location.getBlock().getType() != Material.LADDER) {
|
||||
return MoveResult.FALLING;
|
||||
}
|
||||
|
||||
if(Math.abs(location.getX() - target.getX()) > 1.5 || Math.abs(location.getY() - target.getY()) > 1.5 || Math.abs(location.getZ() - target.getZ()) > 1.5) {
|
||||
return MoveResult.OVERDISTANCE;
|
||||
}
|
||||
|
||||
if(!team.getFightPlayer(entity).canEntern() && !team.getExtendRegion().inRegion(target.toLocation(null)))
|
||||
return MoveResult.OUT_OF_BORDER;
|
||||
return MoveResult.OK;
|
||||
}
|
||||
|
||||
public enum MoveResult {
|
||||
FALLING,
|
||||
OVERDISTANCE,
|
||||
OUT_OF_BORDER,
|
||||
OK,
|
||||
}
|
||||
|
||||
public void move(WorldCoordinate pos) {
|
||||
queue.add(new Action(MOVEMENT_DELAY) {
|
||||
@Override
|
||||
public void run() {
|
||||
Location location = entity.getLocation();
|
||||
if(!entity.isOnGround() && location.getBlock().getType() != Material.LADDER) {
|
||||
FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity falling");
|
||||
return;
|
||||
MoveResult moveResult = checkMove(pos);
|
||||
switch (moveResult) {
|
||||
case FALLING:
|
||||
FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity falling");
|
||||
return;
|
||||
case OVERDISTANCE:
|
||||
FightSystem.getPlugin().getLogger().log(Level.INFO, () -> entity.getName() + ": Overdistance movement " + entity.getLocation().toVector() + " " + pos);
|
||||
return;
|
||||
case OUT_OF_BORDER:
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Location target = translate(pos);
|
||||
if(Math.abs(location.getX() - target.getX()) > 1.0 || Math.abs(location.getY() - target.getY()) > 1.5 || Math.abs(location.getZ() - target.getZ()) > 1.0) {
|
||||
FightSystem.getPlugin().getLogger().log(Level.INFO, () -> entity.getName() + ": Overdistance movement " + location.toVector() + " " + target.toVector());
|
||||
return;
|
||||
Location currentLocation = entity.getLocation();
|
||||
Location target = pos.toLocation(Config.world);
|
||||
if (currentLocation.getBlockX() != target.getBlockX() || currentLocation.getBlockY() != target.getBlockY() || currentLocation.getBlockZ() != target.getBlockZ()) {
|
||||
target.setDirection(target.toVector().subtract(currentLocation.toVector()));
|
||||
}
|
||||
if (currentLocation.getBlockX() == target.getBlockX() && currentLocation.getBlockZ() == target.getBlockZ()) {
|
||||
target.setYaw(currentLocation.getYaw());
|
||||
}
|
||||
|
||||
if(!team.getFightPlayer(entity).canEntern() && !team.getExtendRegion().inRegion(target))
|
||||
return;
|
||||
|
||||
if(!entity.teleport(target, PlayerTeleportEvent.TeleportCause.PLUGIN))
|
||||
FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity not teleported: " + entity.isValid());
|
||||
|
||||
GlobalRecorder.getInstance().entityMoves(entity);
|
||||
navMesh.update(getPosition().toWorld(team));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void move(LocalCoordinate pos) {
|
||||
move(pos.toWorld(team));
|
||||
}
|
||||
|
||||
private boolean interactionDistanceViolation(Location location) {
|
||||
return location.distance(entity.getEyeLocation()) > INTERACTION_RANGE;
|
||||
}
|
||||
|
||||
private void interact(Block block) {
|
||||
BlockData data = block.getBlockData(); //TODO only 1.14+ compatible at the moment
|
||||
System.out.println(block + " " + data);
|
||||
if (data instanceof NoteBlock) {
|
||||
NoteBlock noteBlock = (NoteBlock) data;
|
||||
Note note = noteBlock.getNote();
|
||||
@@ -280,6 +324,7 @@ public abstract class AI {
|
||||
}
|
||||
|
||||
powerable.setPowered(!isPowered);
|
||||
System.out.println(powerable);
|
||||
}
|
||||
block.setBlockData(data);
|
||||
if(data instanceof Switch) {
|
||||
@@ -319,24 +364,6 @@ public abstract class AI {
|
||||
queue.poll().run();
|
||||
}
|
||||
|
||||
public Location translate(Vector pos) {
|
||||
Region extend = team.getExtendRegion();
|
||||
if(Fight.getUnrotated() == team)
|
||||
return new Location(
|
||||
Config.world,
|
||||
pos.getX() + extend.getMinX(),
|
||||
pos.getY() + team.getSchemRegion().getMinY(),
|
||||
pos.getZ() + extend.getMinZ()
|
||||
);
|
||||
else
|
||||
return new Location(
|
||||
Config.world,
|
||||
extend.getMaxX() - pos.getX(),
|
||||
pos.getY() + team.getSchemRegion().getMinY(),
|
||||
extend.getMaxZ() - pos.getZ()
|
||||
);
|
||||
}
|
||||
|
||||
private static class Action {
|
||||
private int delay;
|
||||
public Action(int delay) {
|
||||
|
||||
@@ -20,8 +20,10 @@
|
||||
package de.steamwar.fightsystem.ai;
|
||||
|
||||
import de.steamwar.Reflection;
|
||||
import de.steamwar.core.Core;
|
||||
import de.steamwar.fightsystem.ArenaMode;
|
||||
import de.steamwar.fightsystem.Config;
|
||||
import de.steamwar.fightsystem.ai.yoyonow.YoyoNowAI;
|
||||
import de.steamwar.fightsystem.fight.FightTeam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
@@ -35,7 +37,8 @@ import java.util.stream.Collectors;
|
||||
@AllArgsConstructor
|
||||
public class AIManager {
|
||||
private static final List<AIManager> AIs = Arrays.asList(
|
||||
new AIManager(DummyAI.class, Material.STONE, () -> ArenaMode.Test.contains(Config.mode))
|
||||
new AIManager(DummyAI.class, Material.STONE, () -> ArenaMode.Test.contains(Config.mode)),
|
||||
new AIManager(YoyoNowAI.class, Material.SLIME_BLOCK, () -> Config.GameModeConfig.Schematic.Type.toDB().equals("miniwargear") && Core.getVersion() >= 14)
|
||||
);
|
||||
|
||||
public static List<AIManager> availableAIs() {
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
/*
|
||||
* 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.fightsystem.ai;
|
||||
|
||||
import de.steamwar.fightsystem.ai.schematic.Cannon;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public interface Action {
|
||||
|
||||
Result step(AI ai);
|
||||
|
||||
enum Result {
|
||||
ONGOING,
|
||||
FINISHED,
|
||||
FAILED,
|
||||
;
|
||||
}
|
||||
|
||||
class MultiAction implements Action {
|
||||
|
||||
protected final List<Action> actions = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public Result step(AI ai) {
|
||||
if (!actions.isEmpty()) {
|
||||
Action.Result result = actions.get(0).step(ai);
|
||||
if (result == Action.Result.FAILED) {
|
||||
ai.chat(this + " + " + actions.get(0) + " failed");
|
||||
actions.clear();
|
||||
return Result.FAILED;
|
||||
}
|
||||
if (result == Action.Result.FINISHED) {
|
||||
ai.chat(this + " + " + actions.get(0) + " finished");
|
||||
actions.remove(0);
|
||||
}
|
||||
}
|
||||
return actions.isEmpty() ? Result.FINISHED : Result.ONGOING;
|
||||
}
|
||||
}
|
||||
|
||||
class WaitAction implements Action {
|
||||
|
||||
private int delay;
|
||||
|
||||
public WaitAction(int delay) {
|
||||
this.delay = delay;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result step(AI ai) {
|
||||
if (--delay > 0) {
|
||||
return Result.ONGOING;
|
||||
} else {
|
||||
return Result.FINISHED;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class MoveAction implements Action {
|
||||
|
||||
private final WorldCoordinate destination;
|
||||
private List<WorldCoordinate> path;
|
||||
private int overDistanceCounter = 0;
|
||||
|
||||
public MoveAction(AI ai, LocalCoordinate destination) {
|
||||
this(ai, destination.toWorld(ai.team));
|
||||
}
|
||||
|
||||
public MoveAction(AI ai, WorldCoordinate destination) {
|
||||
this.destination = destination;
|
||||
this.path = ai.navMesh.pathToNearest(ai.getPosition().toWorld(ai.team), destination);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result step(AI ai) {
|
||||
if (this.path.isEmpty()) return Result.FAILED;
|
||||
WorldCoordinate coordinate = path.get(0);
|
||||
|
||||
if (!ai.navMesh.isWalkable(coordinate)) {
|
||||
path = ai.navMesh.pathToNearest(ai.getPosition().toWorld(ai.team), destination);
|
||||
if (path.isEmpty()) return Result.FAILED;
|
||||
coordinate = path.get(0);
|
||||
}
|
||||
|
||||
AI.MoveResult moveResult = ai.checkMove(coordinate);
|
||||
if (moveResult == AI.MoveResult.OVERDISTANCE) {
|
||||
if (overDistanceCounter == 5) {
|
||||
path = ai.navMesh.pathToNearest(ai.getPosition().toWorld(ai.team), destination);
|
||||
return path.isEmpty() ? Result.FAILED : Result.ONGOING;
|
||||
}
|
||||
if (overDistanceCounter++ > 5) {
|
||||
return Result.FAILED;
|
||||
}
|
||||
return Result.ONGOING;
|
||||
}
|
||||
overDistanceCounter = 0;
|
||||
|
||||
if (moveResult == AI.MoveResult.FALLING) {
|
||||
return Result.ONGOING;
|
||||
}
|
||||
|
||||
if (moveResult == AI.MoveResult.OK) {
|
||||
path.remove(0);
|
||||
ai.move(coordinate);
|
||||
}
|
||||
return path.isEmpty() ? Result.FINISHED : Result.ONGOING;
|
||||
}
|
||||
}
|
||||
|
||||
class InteractAction implements Action {
|
||||
private final LocalCoordinate destination;
|
||||
|
||||
public InteractAction(LocalCoordinate destination) {
|
||||
this.destination = destination;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result step(AI ai) {
|
||||
ai.interact(destination);
|
||||
return Result.FINISHED;
|
||||
}
|
||||
}
|
||||
|
||||
class ReadyAction implements Action {
|
||||
|
||||
@Override
|
||||
public Result step(AI ai) {
|
||||
ai.setReady();
|
||||
return Result.FINISHED;
|
||||
}
|
||||
}
|
||||
|
||||
class PlaceTNTAction implements Action {
|
||||
|
||||
private final LocalCoordinate destination;
|
||||
|
||||
public PlaceTNTAction(LocalCoordinate destination) {
|
||||
this.destination = destination;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result step(AI ai) {
|
||||
ai.setTNT(destination);
|
||||
return Result.FINISHED;
|
||||
}
|
||||
}
|
||||
|
||||
class LoadCannon extends MultiAction {
|
||||
|
||||
public LoadCannon(AI ai, Cannon cannon) {
|
||||
for (LocalCoordinate tntPosition : cannon.getTntPositions()) {
|
||||
actions.add(new MoveAction(ai, tntPosition.toWorld(ai.team)));
|
||||
actions.add(new PlaceTNTAction(tntPosition));
|
||||
}
|
||||
|
||||
LocalCoordinate trigger = cannon.getTriggerPositions().iterator().next();
|
||||
actions.add(new MoveAction(ai, trigger.toWorld(ai.team)));
|
||||
actions.add(new InteractAction(trigger));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
/*
|
||||
* 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.fightsystem.ai;
|
||||
|
||||
import de.steamwar.fightsystem.fight.Fight;
|
||||
import de.steamwar.fightsystem.fight.FightTeam;
|
||||
import de.steamwar.fightsystem.utils.Region;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.util.NumberConversions;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class LocalCoordinate {
|
||||
private double x;
|
||||
private double y;
|
||||
private double z;
|
||||
|
||||
public int getBlockX() {
|
||||
return NumberConversions.floor(x);
|
||||
}
|
||||
|
||||
public int getBlockY() {
|
||||
return NumberConversions.floor(y);
|
||||
}
|
||||
|
||||
public int getBlockZ() {
|
||||
return NumberConversions.floor(z);
|
||||
}
|
||||
|
||||
public double distanceSquared(LocalCoordinate coordinate) {
|
||||
return NumberConversions.square(x - coordinate.x) + NumberConversions.square(y - coordinate.y) + NumberConversions.square(z - coordinate.z);
|
||||
}
|
||||
|
||||
public WorldCoordinate toWorld(FightTeam team) {
|
||||
// TODO: Fix the of by one blue/red
|
||||
// Team Red is not correct!
|
||||
// NightTown is team blue unrotated!
|
||||
Region extend = team.getExtendRegion();
|
||||
if(Fight.getUnrotated() == team) {
|
||||
return new WorldCoordinate(
|
||||
x + extend.getMinX(),
|
||||
y + team.getSchemRegion().getMinY(),
|
||||
z + extend.getMinZ()
|
||||
);
|
||||
} else {
|
||||
return new WorldCoordinate(
|
||||
extend.getMaxX() - x - 1,
|
||||
y + team.getSchemRegion().getMinY(),
|
||||
extend.getMaxZ() - z - 1
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
public LocalCoordinate add(LocalCoordinate localCoordinate) {
|
||||
this.x += localCoordinate.x;
|
||||
this.y += localCoordinate.y;
|
||||
this.z += localCoordinate.z;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LocalCoordinate add(double x, double y, double z) {
|
||||
this.x += x;
|
||||
this.y += y;
|
||||
this.z += z;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Local{" + x + "," + y + "," + z + "}";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,402 @@
|
||||
/*
|
||||
* 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.fightsystem.ai;
|
||||
|
||||
import de.steamwar.entity.RBlockDisplay;
|
||||
import de.steamwar.entity.REntity;
|
||||
import de.steamwar.entity.REntityServer;
|
||||
import de.steamwar.fightsystem.ArenaMode;
|
||||
import de.steamwar.fightsystem.Config;
|
||||
import de.steamwar.fightsystem.FightSystem;
|
||||
import de.steamwar.fightsystem.fight.FightTeam;
|
||||
import de.steamwar.fightsystem.states.FightState;
|
||||
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.util.BoundingBox;
|
||||
import org.bukkit.util.NumberConversions;
|
||||
import org.bukkit.util.Transformation;
|
||||
import org.bukkit.util.VoxelShape;
|
||||
import org.joml.AxisAngle4f;
|
||||
import org.joml.Vector3f;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class NavMesh {
|
||||
|
||||
private static final double PLAYER_FALL_DISTANCE = 3;
|
||||
private static final double PLAYER_JUMP_HEIGHT = 1.25;
|
||||
private static final double PLAYER_HEIGHT = 1.8;
|
||||
private static final Cuboid PLAYER_SHADOW = new Cuboid(0.2, 0, 0.2, 0.6, 1, 0.6);
|
||||
|
||||
private static final Set<Pos> RELATIVE_BLOCKS = new HashSet<>();
|
||||
protected static final BlockData PATH_BLOCK = Material.LIME_STAINED_GLASS.createBlockData();
|
||||
|
||||
static {
|
||||
for (int y = (int) -Math.ceil(PLAYER_FALL_DISTANCE); y <= Math.ceil(PLAYER_JUMP_HEIGHT); y++) {
|
||||
RELATIVE_BLOCKS.add(new Pos(-1, y, 0));
|
||||
RELATIVE_BLOCKS.add(new Pos(1, y, 0));
|
||||
RELATIVE_BLOCKS.add(new Pos(0, y, -1));
|
||||
RELATIVE_BLOCKS.add(new Pos(0, y, 1));
|
||||
}
|
||||
RELATIVE_BLOCKS.add(new Pos(0, 1, 0));
|
||||
RELATIVE_BLOCKS.add(new Pos(0, -1, 0));
|
||||
}
|
||||
|
||||
private FightTeam fightTeam;
|
||||
private REntityServer server = new REntityServer();
|
||||
|
||||
private Map<Pos, Pos> walkable = new HashMap<>();
|
||||
private Map<Pos, Set<Pos>> connections = new HashMap<>(); // Reverse connections!
|
||||
|
||||
@Getter
|
||||
private boolean ready = false;
|
||||
|
||||
public NavMesh(FightTeam fightTeam) {
|
||||
this.fightTeam = fightTeam;
|
||||
|
||||
new OneShotStateDependent(ArenaMode.All, FightState.PostSchemSetup, () -> {
|
||||
Bukkit.getOnlinePlayers().forEach(server::addPlayer);
|
||||
|
||||
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> {
|
||||
long time = System.currentTimeMillis();
|
||||
|
||||
fightTeam.getExtendRegion().forEach((x, y, z) -> {
|
||||
if (y < fightTeam.getSchemRegion().getMinY()) return;
|
||||
calculatePosition(new Pos(x, y, z), walkable);
|
||||
});
|
||||
|
||||
walkable.values().forEach(this::checkNeighbouring);
|
||||
|
||||
System.out.println("NavMesh initialized in " + (System.currentTimeMillis() - time) + " ms");
|
||||
ready = true;
|
||||
}, 20);
|
||||
});
|
||||
new OneShotStateDependent(ArenaMode.All, FightState.Spectate, () -> {
|
||||
ready = false;
|
||||
});
|
||||
}
|
||||
|
||||
private void calculatePosition(Pos pos, Map<Pos, Pos> walkable) {
|
||||
Block block = Config.world.getBlockAt(pos.x, pos.y, pos.z);
|
||||
// Air is not walkable
|
||||
if (block.isPassable()) return;
|
||||
|
||||
// Ignore Ladders from floor calculation!
|
||||
if (block.getType() != Material.LADDER) {
|
||||
// Floor Position
|
||||
pos.floor = playerCollisionMax(block.getCollisionShape());
|
||||
// If no walkable block remove
|
||||
if (pos.floor == 0) return;
|
||||
} else {
|
||||
pos.floor = 0.5;
|
||||
}
|
||||
|
||||
// Ceiling Position
|
||||
pos.ceiling = fightTeam.getExtendRegion().getMaxY() - pos.y;
|
||||
for (int y = pos.y + 1; y <= fightTeam.getExtendRegion().getMaxY() + 3; y++) {
|
||||
block = Config.world.getBlockAt(pos.x, y, pos.z);
|
||||
if (block.isPassable()) continue;
|
||||
double min = playerCollisionMin(block.getCollisionShape());
|
||||
if (min >= 1.0) continue;
|
||||
pos.ceiling = y + min - pos.y;
|
||||
break;
|
||||
}
|
||||
// If player cannot fit remove
|
||||
if (pos.ceiling - pos.floor < PLAYER_HEIGHT) return;
|
||||
|
||||
walkable.put(pos, pos);
|
||||
}
|
||||
|
||||
@RequiredArgsConstructor
|
||||
private static class Pos {
|
||||
private final int x;
|
||||
private final int y;
|
||||
private final int z;
|
||||
private double floor = 0;
|
||||
private double ceiling = 0;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return x + "," + y + "(" + floor + ".." + ceiling + ")" + "," + z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (!(o instanceof Pos)) return false;
|
||||
Pos pos = (Pos) o;
|
||||
return x == pos.x && y == pos.y && z == pos.z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(x, y, z);
|
||||
}
|
||||
|
||||
public Pos add(Pos pos) {
|
||||
return new Pos(x + pos.x, y + pos.y, z + pos.z);
|
||||
}
|
||||
|
||||
public WorldCoordinate toWorld() {
|
||||
return new WorldCoordinate(x, y + floor, z);
|
||||
}
|
||||
|
||||
public double floorPosition() {
|
||||
return y + floor;
|
||||
}
|
||||
|
||||
public double ceilingPosition() {
|
||||
return y + ceiling;
|
||||
}
|
||||
}
|
||||
|
||||
private double playerCollisionMax(VoxelShape voxelShape) {
|
||||
List<Double> yList = voxelShape.getBoundingBoxes().stream()
|
||||
.flatMap(boundingBox -> Stream.of(boundingBox.getMinY(), boundingBox.getMaxY()))
|
||||
.sorted()
|
||||
.collect(Collectors.toList());
|
||||
|
||||
double collisionY = 0;
|
||||
for (double y : yList) {
|
||||
if (voxelShape.getBoundingBoxes()
|
||||
.stream()
|
||||
.noneMatch(boundingBox -> collides(y, boundingBox))) {
|
||||
collisionY = y;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return collisionY;
|
||||
}
|
||||
|
||||
private double playerCollisionMin(VoxelShape voxelShape) {
|
||||
List<Double> yList = voxelShape.getBoundingBoxes().stream()
|
||||
.flatMap(boundingBox -> Stream.of(boundingBox.getMinY(), boundingBox.getMaxY()))
|
||||
.sorted(Comparator.reverseOrder())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
double collisionY = 1.5;
|
||||
for (double y : yList) {
|
||||
if (voxelShape.getBoundingBoxes()
|
||||
.stream()
|
||||
.noneMatch(boundingBox -> collides(y - 1, boundingBox))) {
|
||||
collisionY = y;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return collisionY;
|
||||
}
|
||||
|
||||
private boolean collides(double y, BoundingBox boundingBox) {
|
||||
Cuboid second = new Cuboid(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getWidthX(), boundingBox.getHeight(), boundingBox.getWidthZ());
|
||||
return PLAYER_SHADOW.setY(y).intersects(second);
|
||||
}
|
||||
|
||||
@AllArgsConstructor
|
||||
private static class Cuboid {
|
||||
private double x;
|
||||
private double y;
|
||||
private double z;
|
||||
private double dx;
|
||||
private double dy;
|
||||
private double dz;
|
||||
|
||||
public boolean intersects(Cuboid cuboid) {
|
||||
double minx = x - cuboid.dx;
|
||||
double miny = y - cuboid.dy;
|
||||
double minz = z - cuboid.dz;
|
||||
double maxx = minx + dx + cuboid.dx;
|
||||
double maxy = miny + dy + cuboid.dy;
|
||||
double maxz = minz + dz + cuboid.dz;
|
||||
return maxx > cuboid.x && maxy > cuboid.y && maxz > cuboid.z && minx < cuboid.x && miny < cuboid.y && minz < cuboid.z;
|
||||
}
|
||||
|
||||
public Cuboid setY(double y) {
|
||||
return new Cuboid(x, y, z, dx, dy, dz);
|
||||
}
|
||||
}
|
||||
|
||||
public void update(WorldCoordinate coordinate) {
|
||||
final int px = coordinate.getBlockX();
|
||||
final int py = coordinate.getBlockY();
|
||||
final int pz = coordinate.getBlockZ();
|
||||
|
||||
for (int x = -2; x <= 2; x++) {
|
||||
for (int z = -2; z <= 2; z++) {
|
||||
for (int y = fightTeam.getSchemRegion().getMinY(); y <= py + 2; y++) {
|
||||
Pos current = new Pos(px + x, y, pz + z);
|
||||
walkable.remove(current);
|
||||
calculatePosition(current, walkable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
walkable.values().forEach(this::checkNeighbouring);
|
||||
}
|
||||
|
||||
private void checkNeighbouring(Pos pos) {
|
||||
for (Set<Pos> value : connections.values()) {
|
||||
value.remove(pos);
|
||||
}
|
||||
|
||||
for (Pos relative : RELATIVE_BLOCKS) {
|
||||
Pos other = walkable.get(pos.add(relative));
|
||||
if (other == null) continue;
|
||||
|
||||
Block thisBlock = Config.world.getBlockAt(pos.x, pos.y, pos.z);
|
||||
Block otherBlock = Config.world.getBlockAt(other.x, other.y, other.z);
|
||||
|
||||
if (thisBlock.getType() != Material.LADDER && otherBlock.getType() == Material.LADDER) {
|
||||
if ((relative.x != 0 || relative.z != 0) && pos.y != other.y) continue;
|
||||
} else {
|
||||
// Check if jumpable vertical distance
|
||||
if (other.floorPosition() - pos.floorPosition() > PLAYER_JUMP_HEIGHT) continue;
|
||||
// Check if Ceiling is high enough for player walking down!
|
||||
if (other.ceilingPosition() < pos.floorPosition() + PLAYER_HEIGHT) continue;
|
||||
}
|
||||
|
||||
connections.computeIfAbsent(other, __ -> new LinkedHashSet<>()).add(pos);
|
||||
}
|
||||
}
|
||||
|
||||
private Pos toPos(WorldCoordinate coordinate) {
|
||||
Pos pos = new Pos(coordinate.getBlockX(), coordinate.getBlockY(), coordinate.getBlockZ());
|
||||
if (walkable.containsKey(pos)) return walkable.get(pos);
|
||||
pos = new Pos(pos.x, pos.y - 1, pos.z);
|
||||
if (walkable.containsKey(pos)) return walkable.get(pos);
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean isWalkable(WorldCoordinate coordinate) {
|
||||
Pos pos = new Pos(coordinate.getBlockX(), NumberConversions.floor(coordinate.getY() - 0.0625), coordinate.getBlockZ());
|
||||
return walkable.containsKey(pos);
|
||||
}
|
||||
|
||||
public List<WorldCoordinate> walkable() {
|
||||
return walkable.values().stream().map(Pos::toWorld).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public List<WorldCoordinate> pathToNearest(WorldCoordinate fromCoordinate, WorldCoordinate toCoordinate) {
|
||||
Pos to = toPos(toCoordinate);
|
||||
if (walkable.containsKey(to)) return path(toPos(fromCoordinate), to);
|
||||
|
||||
Pos closestTo = walkable.values()
|
||||
.stream()
|
||||
.filter(pos -> {
|
||||
double distance = pos.toWorld().distanceSquared(toCoordinate);
|
||||
return distance < AI.INTERACTION_RANGE * AI.INTERACTION_RANGE && distance > 1.5 * 1.5;
|
||||
})
|
||||
.min(Comparator.comparing(pos -> pos.toWorld().distanceSquared(toCoordinate)))
|
||||
.orElse(null);
|
||||
|
||||
if (closestTo == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return path(toPos(fromCoordinate), closestTo);
|
||||
}
|
||||
|
||||
public List<WorldCoordinate> path(WorldCoordinate fromCoordinate, WorldCoordinate toCoordinate) {
|
||||
Pos from = toPos(fromCoordinate);
|
||||
Pos to = toPos(toCoordinate);
|
||||
return path(from, to);
|
||||
}
|
||||
|
||||
private List<WorldCoordinate> path(Pos from, Pos to) {
|
||||
server.getEntities().forEach(REntity::die);
|
||||
|
||||
if (from == null || to == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (from.equals(to)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
List<Pos> checking = new ArrayList<>(Arrays.asList(to));
|
||||
Map<Pos, Pos> route = new HashMap<>();
|
||||
while (!checking.isEmpty()) {
|
||||
Set<Pos> toCheck = new HashSet<>();
|
||||
for (Pos pos : checking) {
|
||||
boolean foundFrom = false;
|
||||
Set<Pos> successors = connections.get(pos);
|
||||
if (successors == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
for (Pos p : successors) {
|
||||
if (route.containsKey(p)) continue;
|
||||
route.put(p, pos);
|
||||
toCheck.add(p);
|
||||
foundFrom = p.equals(from);
|
||||
if (foundFrom) break;
|
||||
}
|
||||
|
||||
if (foundFrom) {
|
||||
List<Pos> path = new ArrayList<>();
|
||||
path.add(from);
|
||||
|
||||
while (path.get(path.size() - 1) != to) {
|
||||
path.add(route.get(path.get(path.size() - 1)));
|
||||
}
|
||||
|
||||
for (int i = 0; i < path.size(); i++) {
|
||||
path.set(i, walkable.get(path.get(i)));
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
while (i < path.size() - 1) {
|
||||
Pos current = path.get(i);
|
||||
Pos next = path.get(i + 1);
|
||||
|
||||
if (current.floorPosition() > next.floorPosition() + 1) {
|
||||
Pos between = new Pos(next.x, current.y, next.z);
|
||||
between.floor = current.floor;
|
||||
path.add(i + 1, between);
|
||||
i++;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
List<WorldCoordinate> coordinates = path.stream().skip(1).map(Pos::toWorld).collect(Collectors.toList());
|
||||
coordinates.forEach(coordinate -> {
|
||||
RBlockDisplay block = new RBlockDisplay(server, coordinate.toLocation(Config.world));
|
||||
block.setBlock(PATH_BLOCK);
|
||||
block.setTransform(new Transformation(new Vector3f(0, 0, 0), new AxisAngle4f(0, 0, 0, 0), new Vector3f(1, 0.001F, 1), new AxisAngle4f(0, 0, 0, 0)));
|
||||
});
|
||||
|
||||
coordinates.forEach(vector -> vector.add(0.5, 0, 0.5));
|
||||
return coordinates;
|
||||
}
|
||||
}
|
||||
|
||||
checking.clear();
|
||||
checking.addAll(toCheck);
|
||||
}
|
||||
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
/*
|
||||
* 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.fightsystem.ai;
|
||||
|
||||
import de.steamwar.fightsystem.fight.Fight;
|
||||
import de.steamwar.fightsystem.fight.FightTeam;
|
||||
import de.steamwar.fightsystem.utils.Region;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.util.NumberConversions;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class WorldCoordinate {
|
||||
private double x;
|
||||
private double y;
|
||||
private double z;
|
||||
|
||||
public static WorldCoordinate from(Location location) {
|
||||
return new WorldCoordinate(location.getX(), location.getY(), location.getZ());
|
||||
}
|
||||
|
||||
public static WorldCoordinate from(Vector vector) {
|
||||
return new WorldCoordinate(vector.getX(), vector.getY(), vector.getZ());
|
||||
}
|
||||
|
||||
public int getBlockX() {
|
||||
return NumberConversions.floor(x);
|
||||
}
|
||||
|
||||
public int getBlockY() {
|
||||
return NumberConversions.floor(y);
|
||||
}
|
||||
|
||||
public int getBlockZ() {
|
||||
return NumberConversions.floor(z);
|
||||
}
|
||||
|
||||
public double distanceSquared(WorldCoordinate coordinate) {
|
||||
return NumberConversions.square(x - coordinate.x) + NumberConversions.square(y - coordinate.y) + NumberConversions.square(z - coordinate.z);
|
||||
}
|
||||
|
||||
public LocalCoordinate toLocal(FightTeam team) {
|
||||
// TODO: Fix the of by one blue/red
|
||||
Region extend = team.getExtendRegion();
|
||||
if (Fight.getUnrotated() == team) {
|
||||
return new LocalCoordinate(
|
||||
x - extend.getMinX(),
|
||||
y - team.getSchemRegion().getMinY(),
|
||||
z - extend.getMinZ()
|
||||
);
|
||||
} else {
|
||||
return new LocalCoordinate(
|
||||
extend.getMaxX() - x + 1,
|
||||
y - team.getSchemRegion().getMinY(),
|
||||
extend.getMaxZ() - z + 1
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
public WorldCoordinate add(WorldCoordinate worldCoordinate) {
|
||||
this.x += worldCoordinate.x;
|
||||
this.y += worldCoordinate.y;
|
||||
this.z += worldCoordinate.z;
|
||||
return this;
|
||||
}
|
||||
|
||||
public WorldCoordinate add(double x, double y, double z) {
|
||||
this.x += x;
|
||||
this.y += y;
|
||||
this.z += z;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Vector toVector() {
|
||||
return new Vector(x, y, z);
|
||||
}
|
||||
|
||||
public Location toLocation(World world) {
|
||||
return new Location(world, x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "World{" + x + "," + y + "," + z + "}";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
/*
|
||||
* 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.fightsystem.ai.schematic;
|
||||
|
||||
import de.steamwar.fightsystem.ai.LocalCoordinate;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
@Getter
|
||||
public class Bridge {
|
||||
|
||||
private final Set<LocalCoordinate> shieldActivators = new HashSet<>();
|
||||
private LocalCoordinate automaticActivator = null;
|
||||
private int automaticActivatorTime = 0;
|
||||
|
||||
public Bridge addShieldActivator(LocalCoordinate shieldActivator) {
|
||||
this.shieldActivators.add(shieldActivator);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Bridge addAutomaticActivator(LocalCoordinate automaticActivator, int automaticActivatorTime) {
|
||||
this.automaticActivator = automaticActivator;
|
||||
this.automaticActivatorTime = automaticActivatorTime;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
+20
-10
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -17,19 +17,29 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.fightsystem.listener;
|
||||
package de.steamwar.fightsystem.ai.schematic;
|
||||
|
||||
import de.steamwar.core.VersionDependent;
|
||||
import de.steamwar.fightsystem.FightSystem;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import de.steamwar.fightsystem.ai.LocalCoordinate;
|
||||
import lombok.Getter;
|
||||
|
||||
@Linked
|
||||
public class WindchargeStopper {
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
static {
|
||||
VersionDependent.getVersionImpl(FightSystem.getPlugin());
|
||||
@Getter
|
||||
public class Cannon {
|
||||
|
||||
private final List<LocalCoordinate> tntPositions = new ArrayList<>();
|
||||
private final Set<LocalCoordinate> triggerPositions = new HashSet<>();
|
||||
|
||||
public Cannon addTnt(LocalCoordinate tnt) {
|
||||
tntPositions.add(tnt);
|
||||
return this;
|
||||
}
|
||||
|
||||
public interface IWindchargeStopper {
|
||||
public Cannon addTrigger(LocalCoordinate trigger) {
|
||||
triggerPositions.add(trigger);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -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.fightsystem.ai.schematic;
|
||||
|
||||
import de.steamwar.fightsystem.ai.LocalCoordinate;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.util.Consumer;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
public class WarMachine {
|
||||
|
||||
private int schematicId = 0;
|
||||
private Bridge bridge = new Bridge();
|
||||
private List<Cannon> cannons = new ArrayList<>();
|
||||
private List<LocalCoordinate> tntChests = new ArrayList<>();
|
||||
|
||||
public WarMachine setSchematicId(int schematicId) {
|
||||
this.schematicId = schematicId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public WarMachine editBridge(Consumer<Bridge> initializer) {
|
||||
initializer.accept(bridge);
|
||||
return this;
|
||||
}
|
||||
|
||||
public WarMachine addCannon(Consumer<Cannon> initializer) {
|
||||
Cannon cannon = new Cannon();
|
||||
initializer.accept(cannon);
|
||||
cannons.add(cannon);
|
||||
return this;
|
||||
}
|
||||
|
||||
public WarMachine addTnTChest(LocalCoordinate chest) {
|
||||
tntChests.add(chest);
|
||||
return this;
|
||||
}
|
||||
|
||||
public WarMachine finish(List<WarMachine> list) {
|
||||
list.add(this);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
+71
@@ -0,0 +1,71 @@
|
||||
/*
|
||||
* 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.fightsystem.ai.schematic.impl;
|
||||
|
||||
import de.steamwar.fightsystem.ai.LocalCoordinate;
|
||||
import de.steamwar.fightsystem.ai.schematic.WarMachine;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class MiniWarGear20 {
|
||||
|
||||
private static final Random RANDOM = new Random();
|
||||
private static final List<WarMachine> MiniWarGear20 = new ArrayList<>();
|
||||
|
||||
public static WarMachine select() {
|
||||
return MiniWarGear20.get(RANDOM.nextInt(MiniWarGear20.size()));
|
||||
}
|
||||
|
||||
public static WarMachine select(int schematicId) {
|
||||
return MiniWarGear20.stream()
|
||||
.filter(warMachine -> warMachine.getSchematicId() == schematicId)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
public static final WarMachine DPR_PV1_Reaper = new WarMachine()
|
||||
.setSchematicId(135745)
|
||||
.editBridge(bridge -> {
|
||||
bridge.addShieldActivator(new LocalCoordinate(22, 15, 18));
|
||||
bridge.addShieldActivator(new LocalCoordinate(31, 3, 12));
|
||||
bridge.addShieldActivator(new LocalCoordinate(19, 3, 12));
|
||||
})
|
||||
.addCannon(cannon -> {
|
||||
cannon.addTnt(new LocalCoordinate(29, 1, 21));
|
||||
cannon.addTnt(new LocalCoordinate(29, 1, 22));
|
||||
cannon.addTnt(new LocalCoordinate(29, 1, 23));
|
||||
cannon.addTnt(new LocalCoordinate(30, 1, 22));
|
||||
cannon.addTnt(new LocalCoordinate(30, 1, 23));
|
||||
cannon.addTnt(new LocalCoordinate(29, 2, 24));
|
||||
cannon.addTnt(new LocalCoordinate(30, 2, 24));
|
||||
cannon.addTnt(new LocalCoordinate(29, 2, 25));
|
||||
cannon.addTnt(new LocalCoordinate(30, 2, 25));
|
||||
cannon.addTnt(new LocalCoordinate(29, 3, 24));
|
||||
cannon.addTnt(new LocalCoordinate(30, 3, 24));
|
||||
cannon.addTnt(new LocalCoordinate(29, 3, 25));
|
||||
cannon.addTnt(new LocalCoordinate(30, 3, 25));
|
||||
cannon.addTrigger(new LocalCoordinate(30, 3, 19));
|
||||
cannon.addTrigger(new LocalCoordinate(31, 3, 18));
|
||||
cannon.addTrigger(new LocalCoordinate(31, 3, 20));
|
||||
})
|
||||
.finish(MiniWarGear20);
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
/*
|
||||
* 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.fightsystem.ai.yoyonow;
|
||||
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import de.steamwar.fightsystem.ai.AI;
|
||||
import de.steamwar.fightsystem.ai.Action;
|
||||
import de.steamwar.fightsystem.ai.schematic.Cannon;
|
||||
import de.steamwar.fightsystem.ai.schematic.WarMachine;
|
||||
import de.steamwar.fightsystem.ai.schematic.impl.MiniWarGear20;
|
||||
import de.steamwar.fightsystem.fight.FightTeam;
|
||||
import de.steamwar.fightsystem.states.FightState;
|
||||
import de.steamwar.sql.SchematicNode;
|
||||
import de.steamwar.sql.SteamwarUser;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class YoyoNowAI extends AI {
|
||||
|
||||
private WarMachine selectedSchematic;
|
||||
|
||||
protected YoyoNowAI(FightTeam team) {
|
||||
super(team, SteamwarUser.get("YoyoNow.AI"));
|
||||
getEntity().setGlowing(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SchematicNode chooseSchematic() {
|
||||
selectedSchematic = MiniWarGear20.select();
|
||||
return SchematicNode.getSchematicNode(selectedSchematic.getSchematicId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void schematic(Clipboard clipboard) {
|
||||
selectedSchematic = MiniWarGear20.select(team.getSchematic());
|
||||
if (selectedSchematic == null) stop();
|
||||
}
|
||||
|
||||
private final Random random = new Random();
|
||||
|
||||
private List<Action> actions = new ArrayList<>();
|
||||
|
||||
private boolean setupDone = false;
|
||||
|
||||
@Override
|
||||
protected void plan() {
|
||||
if (!navMesh.isReady()) return;
|
||||
|
||||
if (!actions.isEmpty()) {
|
||||
Action.Result result = actions.get(0).step(this);
|
||||
if (result == Action.Result.FAILED) {
|
||||
chat(actions.get(0) + " failed");
|
||||
actions.clear();
|
||||
return;
|
||||
}
|
||||
if (result == Action.Result.FINISHED) {
|
||||
chat(actions.get(0) + " finished");
|
||||
actions.remove(0);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!setupDone && FightState.getFightState() == FightState.POST_SCHEM_SETUP) {
|
||||
chat("Setup actions to perform!");
|
||||
selectedSchematic.getBridge().getShieldActivators().forEach(localCoordinate -> {
|
||||
actions.add(new Action.MoveAction(this, localCoordinate.toWorld(getTeam())));
|
||||
actions.add(new Action.InteractAction(localCoordinate));
|
||||
});
|
||||
actions.add(new Action.ReadyAction());
|
||||
chat("Actions: " + actions.size());
|
||||
setupDone = true;
|
||||
}
|
||||
|
||||
if (FightState.getFightState() == FightState.RUNNING) {
|
||||
Cannon cannon = selectedSchematic.getCannons().get(random.nextInt(selectedSchematic.getCannons().size()));
|
||||
actions.add(new Action.LoadCannon(this, cannon));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -181,12 +181,7 @@ public class Permanent implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onExplosion(EntityExplodeEvent e) {
|
||||
if (!(e.getEntity() instanceof TNTPrimed)) {
|
||||
if (Config.GameModeConfig.Schematic.Type.toDB().equals("wargearseason26")) {
|
||||
e.blockList().clear();
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (!(e.getEntity() instanceof TNTPrimed)) return;
|
||||
if (!Config.GameModeConfig.Arena.WaterDamage) return;
|
||||
e.blockList().removeIf(block -> {
|
||||
if(block.getType() == Material.TNT) {
|
||||
|
||||
+24
-9
@@ -35,7 +35,10 @@ import org.bukkit.entity.HumanEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.inventory.*;
|
||||
import org.bukkit.event.inventory.InventoryAction;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.inventory.InventoryCloseEvent;
|
||||
import org.bukkit.event.inventory.InventoryOpenEvent;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
@@ -78,8 +81,25 @@ public class PersonalKitCreator implements Listener {
|
||||
if(!openKitCreators.containsKey(e.getWhoClicked()))
|
||||
return;
|
||||
|
||||
Player player = (Player) e.getWhoClicked();
|
||||
//Deny bad items
|
||||
if(Kit.isBadItem(e.getCursor()))
|
||||
e.setCancelled(true);
|
||||
|
||||
/* Should the inventory reset? */
|
||||
if(e.getAction() != InventoryAction.PLACE_ALL)
|
||||
return;
|
||||
|
||||
ItemStack[] items = e.getWhoClicked().getInventory().getContents();
|
||||
for(int i = 0; i < items.length; i++){
|
||||
ItemStack stack = items[i];
|
||||
if(stack != null && i != e.getSlot())
|
||||
return;
|
||||
}
|
||||
|
||||
FightPlayer fightPlayer = Fight.getFightPlayer(player);
|
||||
assert fightPlayer != null;
|
||||
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> fightPlayer.getKit().loadToPlayer(player), 1);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
@@ -97,10 +117,7 @@ public class PersonalKitCreator implements Listener {
|
||||
if(backup == null)
|
||||
return;
|
||||
|
||||
InventoryType type = e.getInventory().getType();
|
||||
if(type != InventoryType.PLAYER && type != InventoryType.CREATIVE) {
|
||||
backup.close();
|
||||
}
|
||||
backup.close();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
@@ -109,7 +126,7 @@ public class PersonalKitCreator implements Listener {
|
||||
if(backup == null)
|
||||
return;
|
||||
|
||||
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), backup::close, 1);
|
||||
backup.close();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
@@ -134,11 +151,9 @@ public class PersonalKitCreator implements Listener {
|
||||
}
|
||||
|
||||
private void close(){
|
||||
openKitCreators.remove(player);
|
||||
Kit kit1 = new Kit(kit.getName(), player);
|
||||
kit1.removeBadItems();
|
||||
|
||||
|
||||
openKitCreators.remove(player);
|
||||
kit1.toPersonalKit(kit);
|
||||
backup.loadToPlayer(player);
|
||||
player.setGameMode(GameMode.SURVIVAL);
|
||||
|
||||
@@ -91,4 +91,14 @@ tasks.register<FightServer>("QuickGear20") {
|
||||
template = "QuickGear20"
|
||||
worldName = "arenas/WarGearPark"
|
||||
config = "QuickGear20.yml"
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register<FightServer>("MiniWarGear20") {
|
||||
group = "run"
|
||||
description = "Run a MiniWarGear 1.20 Fight Server"
|
||||
dependsOn(":SpigotCore:shadowJar")
|
||||
dependsOn(":FightSystem:shadowJar")
|
||||
template = "MiniWarGear20"
|
||||
worldName = "arenas/NightTown"
|
||||
config = "MiniWarGear20.yml"
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly(project(":SpigotCore", "default"))
|
||||
compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default"))
|
||||
|
||||
compileOnly(libs.paperapi21) {
|
||||
attributes {
|
||||
// Very Hacky, but it works
|
||||
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
|
||||
}
|
||||
}
|
||||
|
||||
compileOnly(libs.nms21)
|
||||
compileOnly(libs.fawe21)
|
||||
}
|
||||
-137
@@ -1,137 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.schematicsystem.autocheck;
|
||||
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.entity.Entity;
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
import de.steamwar.core.Core;
|
||||
import de.steamwar.sql.GameModeConfig;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class AutoChecker21 implements AutoChecker.IAutoChecker {
|
||||
|
||||
public AutoChecker.BlockScanResult scan(Clipboard clipboard, GameModeConfig<Material, String> type) {
|
||||
AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
|
||||
BlockVector3 min = clipboard.getMinimumPoint();
|
||||
BlockVector3 max = clipboard.getMaximumPoint();
|
||||
for (int x = min.getBlockX(); x <= max.getBlockX(); x++) {
|
||||
for (int y = min.getBlockY(); y <= max.getBlockY(); y++) {
|
||||
for (int z = min.getBlockZ(); z <= max.getBlockZ(); z++) {
|
||||
final BaseBlock block = clipboard.getFullBlock(BlockVector3.at(x, y, z));
|
||||
final Material material = Material.matchMaterial(block.getBlockType().getId());
|
||||
if (material == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
result.getBlockCounts().merge(material, 1, Integer::sum);
|
||||
|
||||
if (AutoCheckerItems.impl.getInventoryMaterials().contains(material)) {
|
||||
checkInventory(result, block, material, new BlockPos(x, y, z), type);
|
||||
}
|
||||
|
||||
if (x == min.getBlockX() || x == max.getBlockX() || y == max.getBlockY() || z == min.getBlockZ() || z == max.getBlockZ()) {
|
||||
result.getDesignBlocks().computeIfAbsent(material, m -> new ArrayList<>()).add(new BlockPos(x, y, z));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static final Map<Material, Set<Material>> itemsInInv = new EnumMap<>(Material.class);
|
||||
|
||||
static {
|
||||
itemsInInv.put(Material.BUCKET, EnumSet.of(Material.DISPENSER));
|
||||
itemsInInv.put(Material.TNT, EnumSet.of(Material.CHEST, Material.BARREL, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX,
|
||||
Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX,
|
||||
Material.LIGHT_GRAY_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX,
|
||||
Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX));
|
||||
itemsInInv.put(Material.FIRE_CHARGE, EnumSet.of(Material.DISPENSER));
|
||||
itemsInInv.put(Material.ARROW, EnumSet.of(Material.DISPENSER));
|
||||
AutoCheckerItems.impl.getAllowedMaterialsInInventory().forEach(material -> itemsInInv.put(material, AutoCheckerItems.impl.getInventoryMaterials()));
|
||||
}
|
||||
|
||||
private void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos, GameModeConfig<Material, String> type) {
|
||||
CompoundTag nbt = block.getNbtData();
|
||||
if (nbt == null) {
|
||||
result.getDefunctNbt().add(pos);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (material == Material.JUKEBOX && nbt.getValue().containsKey("RecordItem")) {
|
||||
result.getRecords().add(pos);
|
||||
return;
|
||||
}
|
||||
|
||||
List<CompoundTag> items = nbt.getList("Items", CompoundTag.class);
|
||||
if (items.isEmpty())
|
||||
return; // Leeres Inventar
|
||||
|
||||
int counter = 0;
|
||||
int windChargeCount = 0;
|
||||
for (CompoundTag item : items) {
|
||||
if (!item.containsKey("id")) {
|
||||
result.getDefunctNbt().add(pos);
|
||||
continue;
|
||||
}
|
||||
|
||||
Material itemType = Material.matchMaterial(item.getString("id"));
|
||||
if (itemType == null) // Leere Slots
|
||||
continue;
|
||||
|
||||
if(type.Schematic.Type.getName().equals("wargearseason26") && material == Material.DISPENSER && itemType == Material.WIND_CHARGE) {
|
||||
windChargeCount += item.getInt("count");
|
||||
}
|
||||
else if (!itemsInInv.getOrDefault(itemType, EnumSet.noneOf(Material.class)).contains(material)) {
|
||||
result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
|
||||
} else if (material == Material.DISPENSER && (itemType == Material.ARROW || itemType == Material.FIRE_CHARGE)) {
|
||||
counter += Core.getVersion() >= 21 ? item.getInt("count") : item.getByte("Count");
|
||||
}
|
||||
if (item.containsKey("tag")) {
|
||||
result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
|
||||
}
|
||||
}
|
||||
result.getDispenserItems().put(pos, counter);
|
||||
result.getWindChargeCount().put(pos, windChargeCount);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
|
||||
return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
|
||||
.depth(clipboard.getDimensions().getBlockZ()).blockScanResult(scan(clipboard, type))
|
||||
.entities(clipboard.getEntities().stream().map(Entity::getLocation)
|
||||
.map(blockVector3 -> new BlockPos(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()))
|
||||
.collect(Collectors.toList()))
|
||||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
|
||||
return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
|
||||
.depth(clipboard.getDimensions().getBlockZ()).build();
|
||||
}
|
||||
}
|
||||
-49
@@ -1,49 +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.schematicsystem.autocheck;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class AutoCheckerItems21 implements AutoCheckerItems {
|
||||
|
||||
private static final Set<Material> INVENTORY = EnumSet.of(Material.BARREL, Material.BLAST_FURNACE, Material.BREWING_STAND, Material.CAMPFIRE,
|
||||
Material.CHEST, Material.DISPENSER, Material.DROPPER, Material.FURNACE, Material.HOPPER, Material.JUKEBOX, Material.SHULKER_BOX,
|
||||
Material.WHITE_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX,
|
||||
Material.LIME_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.CYAN_SHULKER_BOX,
|
||||
Material.PURPLE_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.RED_SHULKER_BOX,
|
||||
Material.BLACK_SHULKER_BOX, Material.SMOKER, Material.TRAPPED_CHEST);
|
||||
|
||||
private static final Set<Material> FLOWERS = EnumSet.of(Material.CORNFLOWER, Material.POPPY, Material.FERN, Material.DANDELION, Material.BLUE_ORCHID,
|
||||
Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY,
|
||||
Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SUNFLOWER, Material.DIAMOND_HORSE_ARMOR, Material.IRON_HORSE_ARMOR,
|
||||
Material.GOLDEN_HORSE_ARMOR, Material.LEATHER_HORSE_ARMOR, Material.HONEY_BOTTLE, Material.LILAC, Material.ROSE_BUSH, Material.PEONY,
|
||||
Material.TALL_GRASS, Material.LARGE_FERN);
|
||||
|
||||
@Override
|
||||
public Set<Material> getInventoryMaterials() {
|
||||
return INVENTORY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Material> getAllowedMaterialsInInventory() {
|
||||
return FLOWERS;
|
||||
}
|
||||
}
|
||||
@@ -262,8 +262,6 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blocks: §c{0}§7, Max: §e{1}
|
||||
AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unknown block: §c{0}
|
||||
AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
|
||||
AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Forbidden block: §c{0}
|
||||
AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
|
||||
AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Dispenser: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
|
||||
AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Forbidden Item: [{0}, {1}, {2}] -> §c{3}
|
||||
AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Defunct NBT: §7[{0}, {1}, {2}]
|
||||
AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} in Design: [{1}, {2}, {3}]
|
||||
|
||||
@@ -242,8 +242,6 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blöcke: §c{0}§7, Max: §e{1}
|
||||
AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unbekannter Block: §c{0}
|
||||
AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
|
||||
AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Verbotener Block: §c{0}
|
||||
AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
|
||||
AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Werfer: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
|
||||
AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Verbotener gegenstand: [{0}, {1}, {2}] -> §c{3}
|
||||
AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Keine NBT-Daten: §c[{0}, {1}, {2}]
|
||||
AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} im Design: [{1}, {2}, {3}]
|
||||
|
||||
-1
@@ -55,7 +55,6 @@ public class AutoChecker {
|
||||
private final List<BlockPos> records = new ArrayList<>();
|
||||
private final Map<Material, List<BlockPos>> designBlocks = new EnumMap<>(Material.class);
|
||||
private final Map<BlockPos, Integer> dispenserItems = new HashMap<>();
|
||||
private final Map<BlockPos, Integer> windChargeCount = new HashMap<>();
|
||||
private final Map<BlockPos, Set<Material>> forbiddenItems = new HashMap<>();
|
||||
private final Map<BlockPos, Set<Material>> forbiddenNbt = new HashMap<>();
|
||||
}
|
||||
|
||||
+1
-26
@@ -52,7 +52,6 @@ public class AutoCheckerResult {
|
||||
isBlockCountOk() &&
|
||||
isLimitedBlocksOK() &&
|
||||
isDispenserItemsOK() &&
|
||||
isWindchargeCountOK() &&
|
||||
!type.isAfterDeadline() &&
|
||||
entities.isEmpty() &&
|
||||
isDesignBlastResistanceOK();
|
||||
@@ -63,18 +62,8 @@ public class AutoCheckerResult {
|
||||
!type.isAfterDeadline();
|
||||
}
|
||||
|
||||
public boolean isWindchargeCountOK() {
|
||||
if( type.Schematic.Type.getName().equals("wargearseason26")) {
|
||||
int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
|
||||
return windChargesCount <= 2048;
|
||||
}
|
||||
else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isDispenserItemsOK() {
|
||||
return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);
|
||||
return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);
|
||||
}
|
||||
|
||||
public boolean hasWarnings() {
|
||||
@@ -138,19 +127,6 @@ public class AutoCheckerResult {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if(!isWindchargeCountOK()) {
|
||||
int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
|
||||
SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES", p, windChargesCount, 2048);
|
||||
blockScanResult.getWindChargeCount().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > 0).forEach(blockVector3IntegerEntry -> {
|
||||
SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
|
||||
blockVector3IntegerEntry.getKey().getBlockX(),
|
||||
blockVector3IntegerEntry.getKey().getBlockY(),
|
||||
blockVector3IntegerEntry.getKey().getBlockZ(),
|
||||
blockVector3IntegerEntry.getValue());
|
||||
});
|
||||
}
|
||||
|
||||
blockScanResult.getDispenserItems().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > type.Schematic.MaxDispenserItems).forEach(blockVector3IntegerEntry -> {
|
||||
SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_TOO_MANY_DISPENSER_ITEMS", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
|
||||
blockVector3IntegerEntry.getKey().getBlockX(),
|
||||
@@ -159,7 +135,6 @@ public class AutoCheckerResult {
|
||||
blockVector3IntegerEntry.getValue(),
|
||||
type.Schematic.MaxDispenserItems);
|
||||
});
|
||||
|
||||
blockScanResult.getRecords().forEach(blockVector3 -> {
|
||||
SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_RECORD", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3), blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
|
||||
});
|
||||
|
||||
@@ -32,5 +32,4 @@ dependencies {
|
||||
implementation(project(":SchematicSystem:SchematicSystem_15"))
|
||||
implementation(project(":SchematicSystem:SchematicSystem_19"))
|
||||
implementation(project(":SchematicSystem:SchematicSystem_20"))
|
||||
implementation(project(":SchematicSystem:SchematicSystem_21"))
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ package de.steamwar.sql;
|
||||
import com.velocitypowered.api.proxy.Player;
|
||||
import com.velocitypowered.api.proxy.server.RegisteredServer;
|
||||
import de.steamwar.velocitycore.VelocityCore;
|
||||
import de.steamwar.velocitycore.commands.CheckCommand;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@@ -37,6 +38,15 @@ public class SQLWrapperImpl implements SQLWrapper<String> {
|
||||
return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
|
||||
SchematicType type = gameModeConfig.Schematic.Type;
|
||||
if (type.checkType() != null) {
|
||||
CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
|
||||
CheckCommand.addFightType(type.checkType(), type);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void additionalExceptionMetadata(StringBuilder builder) {
|
||||
builder.append("\nServers: ");
|
||||
|
||||
@@ -25,10 +25,7 @@ import lombok.Getter;
|
||||
import lombok.experimental.UtilityClass;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
@UtilityClass
|
||||
public class ArenaMode {
|
||||
@@ -53,12 +50,12 @@ public class ArenaMode {
|
||||
if(!folder.exists())
|
||||
return;
|
||||
|
||||
GameModeConfig.init();
|
||||
SchematicType.init();
|
||||
for (GameModeConfig<String, String> gameModeConfig : GameModeConfig.<String>getAll()) {
|
||||
for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml") && !name.equals("config.yml"))).sorted().toList()) {
|
||||
GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, false);
|
||||
if (!gameModeConfig.Server.loaded) continue;
|
||||
|
||||
allModes.add(gameModeConfig);
|
||||
byInternal.put(gameModeConfig.configFile.getName().replace(".yml", ""), gameModeConfig);
|
||||
byInternal.put(file.getName().replace(".yml", ""), gameModeConfig);
|
||||
for (String name : gameModeConfig.Server.ChatNames) {
|
||||
byChat.put(name.toLowerCase(), gameModeConfig);
|
||||
}
|
||||
|
||||
@@ -40,7 +40,6 @@ import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import java.awt.*;
|
||||
import java.sql.Timestamp;
|
||||
import java.time.Instant;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
@@ -49,9 +48,20 @@ import java.util.logging.Level;
|
||||
|
||||
@Linked
|
||||
public class CheckCommand extends SWCommand {
|
||||
private static final Map<SchematicType, SchematicType> fightTypes = new HashMap<>();
|
||||
private static final Map<SchematicType, List<String>> checkQuestions = new HashMap<>();
|
||||
|
||||
private static final Map<UUID, CheckSession> currentCheckers = new HashMap<>();
|
||||
private static final Map<Integer, CheckSession> currentSchems = new HashMap<>();
|
||||
|
||||
public static void setCheckQuestions(SchematicType checkType, List<String> checkQuestions) {
|
||||
CheckCommand.checkQuestions.put(checkType, checkQuestions);
|
||||
}
|
||||
|
||||
public static void addFightType(SchematicType checkType, SchematicType fightType) {
|
||||
fightTypes.put(checkType, fightType);
|
||||
}
|
||||
|
||||
public static boolean isChecking(Player player){
|
||||
return currentCheckers.containsKey(player.getUniqueId());
|
||||
}
|
||||
@@ -137,7 +147,7 @@ public class CheckCommand extends SWCommand {
|
||||
if(!schem.getSchemtype().check()){
|
||||
VelocityCore.getLogger().log(Level.SEVERE, () -> sender.user().getUserName() + " tried to check an uncheckable schematic!");
|
||||
return;
|
||||
}else if(schem.getOwner() == sender.user().getId() && !sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
|
||||
}else if(schem.getOwner() == sender.user().getId()) {
|
||||
sender.system("CHECK_SCHEMATIC_OWN");
|
||||
return;
|
||||
}
|
||||
@@ -238,9 +248,9 @@ public class CheckCommand extends SWCommand {
|
||||
this.checker = checker;
|
||||
this.schematic = schematic;
|
||||
this.startTime = Timestamp.from(Instant.now());
|
||||
this.checkList = GameModeConfig.getBySchematicType(schematic.getSchemtype()).CheckQuestions.listIterator();
|
||||
this.checkList = checkQuestions.get(schematic.getSchemtype()).listIterator();
|
||||
|
||||
GameModeConfig<String, String> mode = GameModeConfig.getBySchematicType(schematic.getSchemtype());
|
||||
GameModeConfig<String, String> mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
|
||||
new ServerStarter().test(mode, mode.getRandomMap(), checker.getPlayer()).check(schematic.getId()).callback(subserver -> {
|
||||
currentCheckers.put(checker.user().getUUID(), this);
|
||||
currentSchems.put(schematic.getId(), this);
|
||||
@@ -294,60 +304,7 @@ public class CheckCommand extends SWCommand {
|
||||
}
|
||||
|
||||
private void accept(){
|
||||
// TODO: This Code is only for the WGS and because YoyoNow is not available this can be removed or changed after the WGS!
|
||||
if (schematic.getSchemtype().toDB().equals("cwargearseason26")) {
|
||||
int userId = schematic.getOwner();
|
||||
SteamwarUser user = SteamwarUser.byId(userId);
|
||||
int teamId = user.getTeam();
|
||||
|
||||
SchematicNode teamFolder = SchematicNode.getSchematicNodeInNode(172325)
|
||||
.stream()
|
||||
.filter(schematicNode -> schematicNode.getName().startsWith(teamId + "_"))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
if (teamFolder == null) {
|
||||
internalAccept();
|
||||
return;
|
||||
}
|
||||
|
||||
// Copy Schem into team folder of -1 user
|
||||
String name = DateTimeFormatter.ofPattern("yyyy.MM.dd_HH:mm:ss").format(schematic.getLastUpdate().toLocalDateTime());
|
||||
NodeData data = NodeData.getLatest(schematic);
|
||||
SchematicNode node = SchematicNode.createSchematic(-1, name, teamFolder.getNodeId());
|
||||
NodeData.saveFromStream(node, data.schemData(false), data.getNodeFormat());
|
||||
|
||||
// Accept the team folder schematic and set other to Normal as well as adding the original owner on the schematic
|
||||
node.setSchemtype(GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type);
|
||||
NodeMember.createNodeMember(node.getNodeId(), schematic.getOwner());
|
||||
|
||||
// Remove any added players from the schematic in the folder
|
||||
for (SchematicNode schematicNode : SchematicNode.getSchematicNodeInNode(teamFolder.getNodeId())) {
|
||||
if (schematicNode.getNodeId() == node.getNodeId()) continue;
|
||||
for (NodeMember nodeMember : NodeMember.getNodeMembers(schematicNode.getNodeId())) {
|
||||
NodeMember.createNodeMember(node.getNodeId(), nodeMember.getMember());
|
||||
nodeMember.delete();
|
||||
}
|
||||
}
|
||||
|
||||
// Conclude by setting send in schematic to normal and broadcast
|
||||
concludeCheckSession("freigegeben", SchematicType.Normal, () -> {
|
||||
Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
|
||||
owner.withPlayerOrOffline(
|
||||
player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),
|
||||
() -> DiscordAlert.send(owner, Color.GREEN, new Message("DC_TITLE_SCHEMINFO"), new Message("DC_SCHEM_ACCEPT", schematic.getName()), true)
|
||||
);
|
||||
notifyTeam(new Message("CHECK_ACCEPTED_TEAM", schematic.getName(), owner.user().getUserName()));
|
||||
|
||||
return owner.getPlayer() != null;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
internalAccept();
|
||||
}
|
||||
|
||||
private void internalAccept() {
|
||||
concludeCheckSession("freigegeben", GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type, () -> {
|
||||
concludeCheckSession("freigegeben", fightTypes.get(schematic.getSchemtype()), () -> {
|
||||
Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
|
||||
owner.withPlayerOrOffline(
|
||||
player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),
|
||||
|
||||
@@ -50,7 +50,7 @@ public class WhoisCommand extends SWCommand {
|
||||
|
||||
@Register(description = "WHOIS_USAGE")
|
||||
public void whois(Chatter sender, long id, WhoisParameterTypes... parameters) {
|
||||
if(!sender.user().hasPerm(UserPerm.ADMINISTRATION) && !sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) {
|
||||
if(!sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
|
||||
sender.system("UNKNOWN_PLAYER");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,6 @@ import de.steamwar.velocitycore.discord.DiscordBot;
|
||||
import de.steamwar.velocitycore.discord.listeners.ChannelListener;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import net.dv8tion.jda.api.entities.Member;
|
||||
import net.dv8tion.jda.api.entities.User;
|
||||
import net.dv8tion.jda.api.entities.Webhook;
|
||||
import net.dv8tion.jda.api.entities.WebhookClient;
|
||||
@@ -105,16 +104,10 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
|
||||
return;
|
||||
}
|
||||
|
||||
String avatarUrl = null;
|
||||
String avatarUrl;
|
||||
if (user.getDiscordId() != null) {
|
||||
Member member = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId())
|
||||
.onErrorMap(throwable -> null)
|
||||
.complete();
|
||||
if (member != null) {
|
||||
avatarUrl = member.getEffectiveAvatarUrl();
|
||||
}
|
||||
}
|
||||
if (avatarUrl == null) {
|
||||
avatarUrl = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()).complete().getEffectiveAvatarUrl();
|
||||
} else {
|
||||
avatarUrl = DiscordBot.getInstance().getJda().getSelfUser().getAvatarUrl();
|
||||
}
|
||||
|
||||
|
||||
@@ -158,6 +158,7 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
|
||||
public void disable() {
|
||||
sendTabPacket(new ArrayList<>(directTabItems.values()), null);
|
||||
directTabItems.clear();
|
||||
sendTabPacket(current, null);
|
||||
current.clear();
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ public class BauLock {
|
||||
break;
|
||||
case SUPERVISOR:
|
||||
BauweltMember member = BauweltMember.getBauMember(owner.getId(), target.getId());
|
||||
locked = member == null || !member.isSupervisor();
|
||||
locked = !member.isSupervisor();
|
||||
break;
|
||||
case SERVERTEAM:
|
||||
locked = !target.hasPerm(UserPerm.TEAM);
|
||||
|
||||
+6
-4
@@ -101,7 +101,6 @@ dependencyResolutionManagement {
|
||||
library("hamcrest", "org.hamcrest:hamcrest:2.2")
|
||||
library("classindex", "org.atteo.classindex:classindex:3.13")
|
||||
|
||||
|
||||
library("spigotapi", "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
|
||||
library("spigotannotations", "org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT")
|
||||
library("paperapi", "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
|
||||
@@ -183,8 +182,6 @@ include(
|
||||
|
||||
include("CommandFramework")
|
||||
|
||||
include("CLI")
|
||||
|
||||
include(
|
||||
"CommonCore",
|
||||
"CommonCore:Data",
|
||||
@@ -225,7 +222,6 @@ include(
|
||||
"SchematicSystem:SchematicSystem_15",
|
||||
"SchematicSystem:SchematicSystem_19",
|
||||
"SchematicSystem:SchematicSystem_20",
|
||||
"SchematicSystem:SchematicSystem_21",
|
||||
"SchematicSystem:SchematicSystem_Core"
|
||||
)
|
||||
|
||||
@@ -251,5 +247,11 @@ include("TowerRun")
|
||||
|
||||
include("TutorialSystem")
|
||||
|
||||
include(
|
||||
"VelocityCore",
|
||||
"VelocityCore:Dependencies",
|
||||
"VelocityCore:Persistent"
|
||||
)
|
||||
|
||||
include("TNTLeague")
|
||||
include("WebsiteBackend")
|
||||
|
||||
@@ -33,6 +33,4 @@ artifacts:
|
||||
"/jars/website-api.jar": "WebsiteBackend/build/libs/WebsiteBackend-all.jar"
|
||||
|
||||
release:
|
||||
- "rm -rf /jars/sw"
|
||||
- "unzip -o CLI/build/distributions/sw.zip -d /jars"
|
||||
- "sudo systemctl restart api.service"
|
||||
|
||||
Reference in New Issue
Block a user