From 7b02b7efb7232e63591a494b822b73086a5b40b9 Mon Sep 17 00:00:00 2001 From: Michael Burgess Date: Fri, 7 Aug 2026 05:47:55 -0400 Subject: [PATCH] Build configurable BlockParty minigame Co-Authored-By: Claude Sonnet 5 --- .gitea/workflows/build.yml | 29 + .gitignore | 8 + README.md | 213 +++++++ build.gradle | 57 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 +++++++++ gradlew.bat | 94 ++++ settings.gradle | 1 + .../us/tss3/blockparty/BlockPartyPlugin.java | 147 +++++ .../java/us/tss3/blockparty/arena/Arena.java | 529 ++++++++++++++++++ .../tss3/blockparty/arena/ArenaManager.java | 115 ++++ .../blockparty/command/BlockPartyCommand.java | 407 ++++++++++++++ .../tss3/blockparty/config/ArenaConfig.java | 230 ++++++++ .../blockparty/config/ArenaConfigLoader.java | 177 ++++++ .../tss3/blockparty/config/ConfigManager.java | 83 +++ .../blockparty/config/MessagesManager.java | 77 +++ .../tss3/blockparty/floor/FloorManager.java | 229 ++++++++ .../listener/GameplayRestrictionListener.java | 95 ++++ .../listener/PlayerConnectionListener.java | 42 ++ .../logic/ArenaConfigValidator.java | 98 ++++ .../us/tss3/blockparty/logic/ArenaPhase.java | 10 + .../blockparty/logic/ArenaStateMachine.java | 51 ++ .../tss3/blockparty/logic/CountdownLogic.java | 26 + .../blockparty/logic/EliminationLogic.java | 38 ++ .../blockparty/logic/PlayerCountLogic.java | 34 ++ .../blockparty/logic/RoundTimeCalculator.java | 29 + .../blockparty/logic/TargetColorSelector.java | 46 ++ .../us/tss3/blockparty/model/PlayerState.java | 84 +++ .../blockparty/persistence/PlayerStats.java | 50 ++ .../blockparty/persistence/StatsDatabase.java | 128 +++++ .../blockparty/persistence/StatsManager.java | 51 ++ .../placeholder/BlockPartyExpansion.java | 80 +++ .../tss3/blockparty/reward/RewardManager.java | 27 + .../scoreboard/ScoreboardManager.java | 101 ++++ .../blockparty/session/PlayerSession.java | 73 +++ .../blockparty/session/SessionManager.java | 31 + .../us/tss3/blockparty/util/LocationUtil.java | 44 ++ .../us/tss3/blockparty/util/SoundUtil.java | 59 ++ src/main/resources/config.yml | 55 ++ src/main/resources/messages.yml | 56 ++ src/main/resources/plugin.yml | 44 ++ .../logic/ArenaConfigValidatorTest.java | 74 +++ .../logic/ArenaStateMachineTest.java | 49 ++ .../blockparty/logic/CountdownLogicTest.java | 46 ++ .../logic/EliminationLogicTest.java | 49 ++ .../logic/PlayerCountLogicTest.java | 45 ++ .../logic/RoundTimeCalculatorTest.java | 34 ++ .../logic/TargetColorSelectorTest.java | 45 ++ 49 files changed, 4349 insertions(+) create mode 100644 .gitea/workflows/build.yml create mode 100644 .gitignore create mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/us/tss3/blockparty/BlockPartyPlugin.java create mode 100644 src/main/java/us/tss3/blockparty/arena/Arena.java create mode 100644 src/main/java/us/tss3/blockparty/arena/ArenaManager.java create mode 100644 src/main/java/us/tss3/blockparty/command/BlockPartyCommand.java create mode 100644 src/main/java/us/tss3/blockparty/config/ArenaConfig.java create mode 100644 src/main/java/us/tss3/blockparty/config/ArenaConfigLoader.java create mode 100644 src/main/java/us/tss3/blockparty/config/ConfigManager.java create mode 100644 src/main/java/us/tss3/blockparty/config/MessagesManager.java create mode 100644 src/main/java/us/tss3/blockparty/floor/FloorManager.java create mode 100644 src/main/java/us/tss3/blockparty/listener/GameplayRestrictionListener.java create mode 100644 src/main/java/us/tss3/blockparty/listener/PlayerConnectionListener.java create mode 100644 src/main/java/us/tss3/blockparty/logic/ArenaConfigValidator.java create mode 100644 src/main/java/us/tss3/blockparty/logic/ArenaPhase.java create mode 100644 src/main/java/us/tss3/blockparty/logic/ArenaStateMachine.java create mode 100644 src/main/java/us/tss3/blockparty/logic/CountdownLogic.java create mode 100644 src/main/java/us/tss3/blockparty/logic/EliminationLogic.java create mode 100644 src/main/java/us/tss3/blockparty/logic/PlayerCountLogic.java create mode 100644 src/main/java/us/tss3/blockparty/logic/RoundTimeCalculator.java create mode 100644 src/main/java/us/tss3/blockparty/logic/TargetColorSelector.java create mode 100644 src/main/java/us/tss3/blockparty/model/PlayerState.java create mode 100644 src/main/java/us/tss3/blockparty/persistence/PlayerStats.java create mode 100644 src/main/java/us/tss3/blockparty/persistence/StatsDatabase.java create mode 100644 src/main/java/us/tss3/blockparty/persistence/StatsManager.java create mode 100644 src/main/java/us/tss3/blockparty/placeholder/BlockPartyExpansion.java create mode 100644 src/main/java/us/tss3/blockparty/reward/RewardManager.java create mode 100644 src/main/java/us/tss3/blockparty/scoreboard/ScoreboardManager.java create mode 100644 src/main/java/us/tss3/blockparty/session/PlayerSession.java create mode 100644 src/main/java/us/tss3/blockparty/session/SessionManager.java create mode 100644 src/main/java/us/tss3/blockparty/util/LocationUtil.java create mode 100644 src/main/java/us/tss3/blockparty/util/SoundUtil.java create mode 100644 src/main/resources/config.yml create mode 100644 src/main/resources/messages.yml create mode 100644 src/main/resources/plugin.yml create mode 100644 src/test/java/us/tss3/blockparty/logic/ArenaConfigValidatorTest.java create mode 100644 src/test/java/us/tss3/blockparty/logic/ArenaStateMachineTest.java create mode 100644 src/test/java/us/tss3/blockparty/logic/CountdownLogicTest.java create mode 100644 src/test/java/us/tss3/blockparty/logic/EliminationLogicTest.java create mode 100644 src/test/java/us/tss3/blockparty/logic/PlayerCountLogicTest.java create mode 100644 src/test/java/us/tss3/blockparty/logic/RoundTimeCalculatorTest.java create mode 100644 src/test/java/us/tss3/blockparty/logic/TargetColorSelectorTest.java diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml new file mode 100644 index 0000000..8b42fd8 --- /dev/null +++ b/.gitea/workflows/build.yml @@ -0,0 +1,29 @@ +name: Build + +on: + push: + branches: [ "master", "main" ] + pull_request: + branches: [ "master", "main" ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '21' + + - name: Build with Gradle + run: ./gradlew clean build + + - name: Upload plugin jar + uses: actions/upload-artifact@v3 + with: + name: BlockParty + path: build/libs/BlockParty-*.jar diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c83a1f3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.gradle/ +build/ +!gradle/wrapper/gradle-wrapper.jar +.idea/ +*.iml +out/ +.vscode/ +*.log diff --git a/README.md b/README.md new file mode 100644 index 0000000..b964c0e --- /dev/null +++ b/README.md @@ -0,0 +1,213 @@ +# BlockParty + +BlockParty is a colored-floor elimination minigame for PaperMC servers. Players stand on a +floor of colored blocks; each round a target color is announced and players must move onto +it before time runs out. All other blocks vanish, anyone not standing on the target color +(or standing on nothing) falls and is eliminated, and the floor is restored for the next, +slightly faster round. Last player standing wins. + +## Requirements + +- PaperMC 1.21.x (API version `1.21`) +- Java 21 +- No other plugins required. Optional soft-dependencies: PlaceholderAPI, Vault. + +## Installation + +1. Download `BlockParty-.jar` (see [Building from source](#building-from-source)) + or grab it from the CI build artifacts. +2. Drop it into your server's `plugins/` folder. +3. Start/restart the server. `config.yml`, `messages.yml` and the `arenas/` folder are + created automatically under `plugins/BlockParty/`. + +## Commands + +All admin/config commands live under `/blockparty` (alias `/bp`) and work from console +where it makes sense (`create`, `delete`, `enable`, `disable`, `info`, `list`, `reload`). +Commands that require a physical location (`setlobby`, `setspawn`, `setspectator`, +`pos1`, `pos2`) require a player sender. + +### Admin +| Command | Description | +|---|---| +| `/blockparty help` | Show command help | +| `/blockparty create ` | Create a new, disabled arena | +| `/blockparty delete ` | Delete an arena and its config file | +| `/blockparty enable ` | Validate and enable an arena | +| `/blockparty disable ` | Disable an arena, kicking anyone inside | +| `/blockparty setlobby ` | Set the waiting-room location | +| `/blockparty setspawn ` | Set the in-game spawn location | +| `/blockparty setspectator ` | Set the spectator/eliminated location | +| `/blockparty pos1 ` | Set floor region corner 1 | +| `/blockparty pos2 ` | Set floor region corner 2 | +| `/blockparty setfloor ` | Set the allowed floor materials | +| `/blockparty generate ` | Randomly generate and persist the floor layout | +| `/blockparty info ` | Show arena configuration/status and validation errors | +| `/blockparty list` | List all arenas | +| `/blockparty reload` | Reload config.yml, messages.yml and arena definitions | + +### Player +| Command | Description | +|---|---| +| `/blockparty join ` | Join an arena's waiting lobby | +| `/blockparty leave` | Leave your current arena | +| `/blockparty arenas` | List arenas (alias of `list`) | +| `/blockparty stats [player]` | View your or another player's stats | + +## Permissions + +| Permission | Default | Description | +|---|---|---| +| `blockparty.play` | true | Baseline permission to use player commands | +| `blockparty.join` | true | Allows joining arenas | +| `blockparty.spectate` | true | Allows spectating | +| `blockparty.admin` | op | Parent permission, grants all `blockparty.admin.*` | +| `blockparty.admin.create` | op | Create arenas | +| `blockparty.admin.delete` | op | Delete arenas | +| `blockparty.admin.setup` | op | Configure lobby/spawn/floor/etc, enable/disable | +| `blockparty.admin.reload` | op | Reload the plugin | + +## Creating an arena — full walkthrough + +1. `/bp create lobby1` — creates `plugins/BlockParty/arenas/lobby1.yml`. +2. Stand where players should wait and run `/bp setlobby lobby1`. +3. Stand where players should spawn on the floor and run `/bp setspawn lobby1`. +4. Stand where eliminated players/spectators should go and run `/bp setspectator lobby1`. +5. Stand at one corner of the floor area and run `/bp pos1 lobby1`. +6. Stand at the opposite corner and run `/bp pos2 lobby1`. +7. Either: + - Run `/bp setfloor lobby1 RED_CONCRETE,BLUE_CONCRETE,GREEN_CONCRETE,YELLOW_CONCRETE` to + choose the color palette (defaults to the full concrete rainbow if you skip this and + just generate), then `/bp generate lobby1` to lay out and persist a random floor, **or** + - Build the floor by hand out of allowed materials, then run `/bp generate lobby1` is + still required once so BlockParty captures/serializes the exact layout it should restore + each round (BlockParty does not scan the world every round — it restores from the saved + layout for performance and determinism). +8. `/bp info lobby1` to confirm there are no validation errors. +9. `/bp enable lobby1`. +10. Players run `/bp join lobby1`. Once `min-players` is reached the countdown starts + automatically; joining an arena mid-countdown is allowed by default + (`allow-join-while-waiting: true`). + +### Floor selection details + +- `pos1` / `pos2` define the two opposite corners of the rectangular floor region (any Y). +- `setfloor` only changes which materials are *allowed* to be used/regenerated — it does not + touch blocks in the world. +- `generate` is the step that actually writes a random layout (biased evenly across the + configured palette) across the whole region and serializes it into the arena's yml file + (`generated-layout`) so it can be restored exactly, every round, without re-scanning or + re-randomizing the world. + +## Player usage + +- `/bp join ` to enter the waiting lobby. Your inventory, armor, offhand, health, + food, XP, game mode, flight state, location and potion effects are all captured and will + be restored exactly when you leave, get eliminated-and-the-match-ends, or the match ends. +- `/bp leave` at any time to exit and be restored. +- During a round, a title/subtitle/action bar/sound announce the target color, and the + target block is placed in your hotbar (slot 9) as a visual reminder. A boss bar (if + enabled) shows the remaining time as a shrinking progress bar. +- Get eliminated by not standing on the target color when the floor clears, or by falling + off entirely. Eliminated players become spectators at the configured spectator location. +- Last player standing wins; rewards, stats and celebration effects (fireworks, titles, + sounds) fire automatically. + +## Configuration overview + +- **`config.yml`** — global settings: `ui.*` toggles for scoreboard/bossbar/titles/actionbar, + `sounds.*` (Bukkit `Sound` enum names; invalid names are logged and skipped, never crash + the plugin), `performance.floor-blocks-per-tick` (batch size for floor mutations), + `defaults.*` (used only when `/bp create` seeds a new arena), `default-floor-materials` + (the full 16-color concrete palette by default), `rewards.winner.commands`, and + `integrations.placeholderapi`. +- **`messages.yml`** — every user-facing string, in [MiniMessage](https://docs.advntr.dev/minimessage/format.html) + format (Adventure, bundled with Paper). Placeholders like `%player%`, `%arena%`, `%round%`, + `%time%`, `%color%` are substituted per-message. +- **`arenas/.yml`** — one file per arena; a broken file only disables that one arena + (the rest still load) and the error is logged. + +### Reload behavior + +`/blockparty reload` re-reads `config.yml`, `messages.yml`, and every arena file. Arenas +currently in the `RUNNING` or `ENDING` state are **skipped** during arena reload (their +config keeps running unmodified) to avoid corrupting an active match; a warning is logged +per skipped arena. Arenas that are `WAITING`, `STARTING` or `DISABLED` are reloaded fully +from disk. This is a deliberate design choice: rather than queuing a reload for when the +arena goes idle, in-progress matches simply finish on their old configuration and pick up +the new configuration the next time they return to `WAITING`. + +## Rewards + +```yaml +rewards: + winner: + commands: + - "eco give %player% 100" + - "say %player% won BlockParty in %arena% after %round% rounds!" +``` + +Commands run as the console, so no Vault/economy plugin is required by BlockParty itself — +if you reference an economy command (like `eco give`) you need that plugin installed +separately. `%player%`, `%arena%` and `%round%` are replaced before dispatch. + +## PlaceholderAPI support + +If PlaceholderAPI is installed, BlockParty registers a `%blockparty_...%` expansion +automatically (soft-dependency — startup never fails if PAPI is absent): + +- `%blockparty_wins%` +- `%blockparty_games_played%` +- `%blockparty_best_round%` +- `%blockparty_arena%` +- `%blockparty_players_%` +- `%blockparty_state_%` + +## Building from source + +```bash +./gradlew clean build +``` + +The shaded plugin jar (with `sqlite-jdbc` bundled and relocated) is produced at +`build/libs/BlockParty-.jar`. + +Run unit tests only: + +```bash +./gradlew test +``` + +Unit tests cover the pure-logic package (`us.tss3.blockparty.logic`) with no Bukkit +dependency: arena state transitions, countdown start/cancel logic, round-time +progression/clamping math, target-color selection (deterministic via an injectable RNG), +elimination/winner determination, arena config validation, and player-count/join logic. + +## Troubleshooting + +- **"Arena failed validation" on enable** — run `/bp info ` to see exactly which + fields are missing (lobby/spawn/spectator/region/materials/etc). +- **World unloaded warning** — if an arena's world is unloaded while the plugin is running, + BlockParty detects it, safely disables that arena and restores any players inside it. +- **Invalid sound/material in config** — logged as a warning at startup/use and skipped; + it will not crash the plugin. +- **Nothing happens on `/bp join`** — check the arena is enabled (`/bp info `), not + full, and that you are not already in another arena (`/bp leave` first). +- **Floor doesn't look right** — remember `setfloor` only changes the allowed palette; you + must run `/bp generate ` to actually (re)generate and persist a layout. + +## Architecture + +- `logic/` — pure, Bukkit-free game logic (unit tested). +- `arena/` — `Arena` (per-arena runtime state machine + round loop) and `ArenaManager`. +- `config/` — `ArenaConfig`, `ArenaConfigLoader`, `ConfigManager`, `MessagesManager`. +- `floor/` — `FloorManager`, tick-batched floor generation/removal/restoration. +- `session/` — `PlayerSession`, `SessionManager` (single-arena-membership enforcement). +- `model/` — `PlayerState` snapshot/restore. +- `command/` — `BlockPartyCommand` (single entry point, dispatches to handlers). +- `listener/` — connection/quit handling and gameplay restrictions. +- `scoreboard/` — interval-based sidebar scoreboard. +- `reward/` — console-command reward dispatch. +- `persistence/` — async SQLite-backed stats (`StatsDatabase`, `StatsManager`). +- `placeholder/` — optional PlaceholderAPI expansion, loaded only when PAPI is present. +- `util/` — sound/location helpers. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..2b8cda1 --- /dev/null +++ b/build.gradle @@ -0,0 +1,57 @@ +plugins { + id 'java' + id 'com.gradleup.shadow' version '8.3.5' +} + +group = 'us.tss3' +version = '1.0.0' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() + maven { url = 'https://repo.papermc.io/repository/maven-public/' } + maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' } +} + +dependencies { + compileOnly 'io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT' + compileOnly 'me.clip:placeholderapi:2.11.6' + implementation 'org.xerial:sqlite-jdbc:3.47.1.0' + + testImplementation platform('org.junit:junit-bom:5.11.3') + testImplementation 'org.junit.jupiter:junit-jupiter' +} + +def targetJavaVersion = 21 +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + options.release.set(targetJavaVersion) +} + +processResources { + def props = [version: version] + inputs.properties props + filteringCharset 'UTF-8' + filesMatching('plugin.yml') { + expand props + } +} + +shadowJar { + archiveClassifier.set('') + archiveBaseName.set('BlockParty') + relocate 'org.sqlite', 'us.tss3.blockparty.libs.sqlite' +} + +test { + useJUnitPlatform() +} + +build { + dependsOn shadowJar +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9355b41 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..233ca66 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'BlockParty' diff --git a/src/main/java/us/tss3/blockparty/BlockPartyPlugin.java b/src/main/java/us/tss3/blockparty/BlockPartyPlugin.java new file mode 100644 index 0000000..981e42f --- /dev/null +++ b/src/main/java/us/tss3/blockparty/BlockPartyPlugin.java @@ -0,0 +1,147 @@ +package us.tss3.blockparty; + +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.world.WorldUnloadEvent; +import org.bukkit.plugin.java.JavaPlugin; +import us.tss3.blockparty.arena.Arena; +import us.tss3.blockparty.arena.ArenaManager; +import us.tss3.blockparty.command.BlockPartyCommand; +import us.tss3.blockparty.config.ConfigManager; +import us.tss3.blockparty.config.MessagesManager; +import us.tss3.blockparty.listener.GameplayRestrictionListener; +import us.tss3.blockparty.listener.PlayerConnectionListener; +import us.tss3.blockparty.persistence.StatsManager; +import us.tss3.blockparty.placeholder.BlockPartyExpansion; +import us.tss3.blockparty.reward.RewardManager; +import us.tss3.blockparty.scoreboard.ScoreboardManager; +import us.tss3.blockparty.session.SessionManager; +import us.tss3.blockparty.util.SoundUtil; + +public class BlockPartyPlugin extends JavaPlugin implements Listener { + + private ConfigManager configManager; + private MessagesManager messagesManager; + private ArenaManager arenaManager; + private SessionManager sessionManager; + private ScoreboardManager scoreboardManager; + private RewardManager rewardManager; + private StatsManager statsManager; + private SoundUtil soundUtil; + + @Override + public void onEnable() { + saveDefaultConfig(); + this.configManager = new ConfigManager(this); + configManager.load(); + + this.messagesManager = new MessagesManager(this); + messagesManager.load(); + + this.sessionManager = new SessionManager(); + this.soundUtil = new SoundUtil(this); + this.rewardManager = new RewardManager(this); + this.statsManager = new StatsManager(this); + statsManager.init(); + + this.arenaManager = new ArenaManager(this); + arenaManager.loadAll(); + + this.scoreboardManager = new ScoreboardManager(this); + scoreboardManager.start(); + + getServer().getPluginManager().registerEvents(new PlayerConnectionListener(this), this); + getServer().getPluginManager().registerEvents(new GameplayRestrictionListener(this), this); + getServer().getPluginManager().registerEvents(this, this); + + BlockPartyCommand commandHandler = new BlockPartyCommand(this); + var command = getCommand("blockparty"); + if (command != null) { + command.setExecutor(commandHandler); + command.setTabCompleter(commandHandler); + } + + registerPlaceholderApi(); + + getLogger().info("BlockParty enabled."); + } + + @Override + public void onDisable() { + if (arenaManager != null) { + arenaManager.shutdownAll(); + } + if (scoreboardManager != null) { + scoreboardManager.stop(); + } + if (statsManager != null) { + statsManager.shutdown(); + } + getLogger().info("BlockParty disabled."); + } + + /** Reloads config.yml, messages.yml and arena definitions. Arenas mid-match are skipped (see ArenaManager#reloadSafely). */ + public void reloadEverything() { + configManager.load(); + messagesManager.load(); + arenaManager.reloadSafely(); + } + + private void registerPlaceholderApi() { + if (!configManager.isPlaceholderApiEnabled()) { + return; + } + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") == null) { + return; + } + try { + new BlockPartyExpansion(this).register(); + getLogger().info("Hooked into PlaceholderAPI."); + } catch (Throwable t) { + getLogger().warning("Failed to register PlaceholderAPI expansion: " + t.getMessage()); + } + } + + @EventHandler + public void onWorldUnload(WorldUnloadEvent event) { + for (Arena arena : arenaManager.all()) { + if (arena.getConfig().getWorldName() != null && arena.getConfig().getWorldName().equals(event.getWorld().getName())) { + getLogger().warning("World '" + event.getWorld().getName() + "' unloaded - disabling arena '" + arena.getConfig().getName() + "'."); + arena.disable(); + } + } + } + + public ConfigManager getConfigManager() { + return configManager; + } + + public MessagesManager getMessages() { + return messagesManager; + } + + public ArenaManager getArenaManager() { + return arenaManager; + } + + public SessionManager getSessionManager() { + return sessionManager; + } + + public ScoreboardManager getScoreboardManager() { + return scoreboardManager; + } + + public RewardManager getRewardManager() { + return rewardManager; + } + + public StatsManager getStatsManager() { + return statsManager; + } + + public SoundUtil getSoundUtil() { + return soundUtil; + } +} diff --git a/src/main/java/us/tss3/blockparty/arena/Arena.java b/src/main/java/us/tss3/blockparty/arena/Arena.java new file mode 100644 index 0000000..adf4fd0 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/arena/Arena.java @@ -0,0 +1,529 @@ +package us.tss3.blockparty.arena; + +import net.kyori.adventure.bossbar.BossBar; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.title.Title; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.scheduler.BukkitTask; +import us.tss3.blockparty.BlockPartyPlugin; +import us.tss3.blockparty.config.ArenaConfig; +import us.tss3.blockparty.floor.FloorManager; +import us.tss3.blockparty.logic.ArenaPhase; +import us.tss3.blockparty.logic.ArenaStateMachine; +import us.tss3.blockparty.logic.CountdownLogic; +import us.tss3.blockparty.logic.EliminationLogic; +import us.tss3.blockparty.logic.RoundTimeCalculator; +import us.tss3.blockparty.logic.TargetColorSelector; +import us.tss3.blockparty.model.PlayerState; +import us.tss3.blockparty.session.PlayerSession; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.UUID; + +/** A single running arena: owns its state machine, tasks and round lifecycle. */ +public class Arena { + + private final BlockPartyPlugin plugin; + private final ArenaConfig config; + private final FloorManager floorManager; + private final ArenaStateMachine stateMachine = new ArenaStateMachine(ArenaPhase.DISABLED); + private final Random random = new Random(); + private final TargetColorSelector selector = new TargetColorSelector(random::nextInt); + + private final List players = new ArrayList<>(); + private final List spectators = new ArrayList<>(); + + private final List tasks = new ArrayList<>(); + private BossBar bossBar; + + private int countdownRemaining; + private int round = 0; + private Material currentTarget; + private Material previousTarget; + private int currentRoundTime; + private int roundTimeRemaining; + + public Arena(BlockPartyPlugin plugin, ArenaConfig config) { + this.plugin = plugin; + this.config = config; + this.floorManager = new FloorManager(plugin, config); + if (config.isEnabled()) { + stateMachine.transition(ArenaPhase.WAITING); + } + } + + public ArenaConfig getConfig() { + return config; + } + + public FloorManager getFloorManager() { + return floorManager; + } + + public ArenaPhase getPhase() { + return stateMachine.getState(); + } + + public List getPlayers() { + return players; + } + + public List getSpectators() { + return spectators; + } + + public int getRound() { + return round; + } + + public Material getCurrentTarget() { + return currentTarget; + } + + public int getRoundTimeRemaining() { + return roundTimeRemaining; + } + + public int getCurrentRoundTime() { + return currentRoundTime; + } + + public boolean isEnabled() { + return getPhase() != ArenaPhase.DISABLED; + } + + public void enable() { + if (stateMachine.transition(ArenaPhase.WAITING)) { + config.setEnabled(true); + } + } + + public void disable() { + cancelAllTasks(); + // Force reset players out regardless of state + List all = new ArrayList<>(); + all.addAll(players); + all.addAll(spectators); + for (UUID uuid : all) { + removePlayerForce(uuid); + } + stateMachine.transition(ArenaPhase.DISABLED); + config.setEnabled(false); + } + + // ---------- Join / Leave ---------- + + public boolean canJoin() { + ArenaPhase phase = getPhase(); + if (phase != ArenaPhase.WAITING && !(phase == ArenaPhase.STARTING && config.isAllowJoinWhileStarting())) { + return false; + } + return players.size() < config.getMaxPlayers(); + } + + public void addPlayer(Player player) { + PlayerState state = PlayerState.capture(player); + PlayerSession session = new PlayerSession(player.getUniqueId(), config.getName(), state); + plugin.getSessionManager().add(session); + players.add(player.getUniqueId()); + preparePlayerForLobby(player); + plugin.getScoreboardManager().attach(player, this); + + maybeStartCountdown(); + } + + private void preparePlayerForLobby(Player player) { + player.getInventory().clear(); + player.setGameMode(GameMode.ADVENTURE); + player.setHealth(20.0); + player.setFoodLevel(20); + player.setFireTicks(0); + if (config.getLobby() != null) { + player.teleport(config.getLobby()); + } + } + + public void removePlayer(UUID uuid, boolean restoreState) { + players.remove(uuid); + spectators.remove(uuid); + PlayerSession session = plugin.getSessionManager().get(uuid); + Player player = plugin.getServer().getPlayer(uuid); + if (session != null) { + if (restoreState && player != null) { + session.getSavedState().restore(player); + } + plugin.getSessionManager().remove(uuid); + } + if (player != null) { + plugin.getScoreboardManager().detach(player); + } + checkCountdownCancel(); + checkForWinner(); + } + + private void removePlayerForce(UUID uuid) { + removePlayer(uuid, true); + } + + private void checkCountdownCancel() { + if (getPhase() == ArenaPhase.STARTING + && CountdownLogic.shouldCancel(players.size(), config.getMinPlayers(), true)) { + cancelCountdown(); + } + } + + // ---------- Countdown / Starting ---------- + + private void maybeStartCountdown() { + if (getPhase() == ArenaPhase.WAITING + && CountdownLogic.shouldStart(players.size(), config.getMinPlayers(), false)) { + startCountdown(); + } + } + + private void startCountdown() { + if (!stateMachine.transition(ArenaPhase.STARTING)) { + return; + } + countdownRemaining = config.getCountdownDuration(); + BukkitTask task = plugin.getServer().getScheduler().runTaskTimer(plugin, () -> { + if (CountdownLogic.isFinished(countdownRemaining)) { + return; + } + broadcastCountdownTick(); + countdownRemaining = CountdownLogic.tick(countdownRemaining); + if (CountdownLogic.isFinished(countdownRemaining)) { + beginMatch(); + } + }, 0L, 20L); + tasks.add(task); + } + + private void cancelCountdown() { + cancelAllTasks(); + stateMachine.transition(ArenaPhase.WAITING); + for (UUID uuid : players) { + Player p = plugin.getServer().getPlayer(uuid); + if (p != null) { + p.sendMessage(plugin.getMessages().get("countdown.cancelled")); + } + } + } + + private void broadcastCountdownTick() { + Map ph = Map.of("time", String.valueOf(countdownRemaining), "arena", config.getName()); + for (UUID uuid : players) { + Player p = plugin.getServer().getPlayer(uuid); + if (p == null) { + continue; + } + if (plugin.getConfigManager().isActionbarEnabled()) { + p.sendActionBar(plugin.getMessages().get("countdown.actionbar", ph)); + } + if (plugin.getConfigManager().isTitlesEnabled() && (countdownRemaining <= 5 || countdownRemaining == config.getCountdownDuration())) { + p.showTitle(Title.title(plugin.getMessages().get("countdown.title", ph), Component.empty())); + } + plugin.getSoundUtil().play(p, plugin.getConfigManager().getSound("countdown"), 1f, 1f); + } + } + + // ---------- Match flow ---------- + + private void beginMatch() { + cancelAllTasks(); + if (!stateMachine.transition(ArenaPhase.RUNNING)) { + return; + } + round = 0; + previousTarget = null; + if (!floorManager.hasLayout()) { + floorManager.generate(random); + } + floorManager.restoreFull(plugin.getConfigManager().getFloorBatchBlocksPerTick(), () -> { + for (UUID uuid : players) { + Player p = plugin.getServer().getPlayer(uuid); + if (p == null) { + continue; + } + p.setGameMode(GameMode.ADVENTURE); + if (config.getSpawn() != null) { + p.teleport(config.getSpawn()); + } + } + startNextRound(); + }); + } + + private void startNextRound() { + if (EliminationLogic.isMatchOver(players.size())) { + endMatch(players.isEmpty() ? null : (players.isEmpty() ? null : players.get(0))); + return; + } + round++; + List available = floorManager.materialsInLayout().stream().distinct().toList(); + if (available.isEmpty()) { + available = config.getFloorMaterials(); + } + currentTarget = selector.selectExcluding(available, previousTarget); + previousTarget = currentTarget; + currentRoundTime = RoundTimeCalculator.timeForRound( + config.getStartingRoundTime(), config.getMinimumRoundTime(), config.getRoundTimeReduction(), round); + roundTimeRemaining = currentRoundTime; + + announceTarget(); + setupBossBar(); + + BukkitTask task = plugin.getServer().getScheduler().runTaskTimer(plugin, () -> { + roundTimeRemaining--; + updateBossBar(); + if (roundTimeRemaining <= 0) { + cancelAllTasks(); + processRoundEnd(); + } + }, 20L, 20L); + tasks.add(task); + } + + private void announceTarget() { + Map ph = Map.of("color", formatMaterial(currentTarget), "round", String.valueOf(round), + "time", String.valueOf(currentRoundTime)); + ItemStack display = new ItemStack(currentTarget); + for (UUID uuid : players) { + Player p = plugin.getServer().getPlayer(uuid); + if (p == null) { + continue; + } + if (plugin.getConfigManager().isTitlesEnabled()) { + p.showTitle(Title.title(plugin.getMessages().get("round.title", ph), plugin.getMessages().get("round.subtitle", ph))); + } + if (plugin.getConfigManager().isActionbarEnabled()) { + p.sendActionBar(plugin.getMessages().get("round.actionbar", ph)); + } + p.getInventory().setItem(8, display.clone()); + plugin.getSoundUtil().play(p, plugin.getConfigManager().getSound("target-select"), 1f, 1f); + } + } + + private void setupBossBar() { + if (!plugin.getConfigManager().isBossbarEnabled()) { + return; + } + if (bossBar == null) { + bossBar = BossBar.bossBar(Component.text("BlockParty"), 1f, BossBar.Color.YELLOW, BossBar.Overlay.PROGRESS); + } + bossBar.progress(1f); + for (UUID uuid : players) { + Player p = plugin.getServer().getPlayer(uuid); + if (p != null) { + p.showBossBar(bossBar); + } + } + } + + private void updateBossBar() { + if (bossBar == null || currentRoundTime <= 0) { + return; + } + float progress = Math.max(0f, Math.min(1f, (float) roundTimeRemaining / (float) currentRoundTime)); + bossBar.progress(progress); + } + + private void processRoundEnd() { + plugin.getSoundUtil().play(config.getSpawn(), plugin.getConfigManager().getSound("floor-disappear"), 1f, 1f); + floorManager.removeNonTarget(currentTarget, plugin.getConfigManager().getFloorBatchBlocksPerTick(), () -> { + BukkitTask delay = plugin.getServer().getScheduler().runTaskLater(plugin, this::evaluateEliminations, + config.getFloorRemoveDelaySeconds() * 20L); + tasks.add(delay); + }); + } + + private void evaluateEliminations() { + List> states = new ArrayList<>(); + for (UUID uuid : players) { + Player p = plugin.getServer().getPlayer(uuid); + Material standing = null; + if (p != null && p.getWorld() != null) { + standing = floorManager.materialAtLocation(p.getWorld(), p.getLocation().getX(), p.getLocation().getY(), p.getLocation().getZ()); + } + states.add(new EliminationLogic.PlayerFloorState<>(uuid, standing)); + } + List eliminated = EliminationLogic.determineEliminated(states, currentTarget); + for (UUID uuid : eliminated) { + eliminatePlayer(uuid); + } + for (UUID uuid : players) { + PlayerSession session = plugin.getSessionManager().get(uuid); + if (session != null && !eliminated.contains(uuid)) { + session.incrementRoundsSurvived(); + } + } + + if (EliminationLogic.isMatchOver(players.size())) { + UUID winner = players.isEmpty() ? null : players.get(0); + if (bossBar != null) { + for (UUID uuid : spectators) { + Player p = plugin.getServer().getPlayer(uuid); + if (p != null) { + p.hideBossBar(bossBar); + } + } + } + endMatch(winner); + return; + } + + BukkitTask restoreDelay = plugin.getServer().getScheduler().runTaskLater(plugin, () -> + floorManager.restoreFull(plugin.getConfigManager().getFloorBatchBlocksPerTick(), this::startNextRound), + config.getFloorRestoreDelaySeconds() * 20L); + tasks.add(restoreDelay); + } + + private void eliminatePlayer(UUID uuid) { + players.remove(uuid); + spectators.add(uuid); + Player p = plugin.getServer().getPlayer(uuid); + PlayerSession session = plugin.getSessionManager().get(uuid); + if (session != null) { + session.setRole(PlayerSession.Role.SPECTATOR); + session.setEliminated(true); + } + if (p != null) { + p.setGameMode(GameMode.SPECTATOR); + if (config.getSpectator() != null) { + p.teleport(config.getSpectator()); + } + p.sendMessage(plugin.getMessages().get("game.eliminated", Map.of("arena", config.getName(), "round", String.valueOf(round)))); + plugin.getSoundUtil().play(p, plugin.getConfigManager().getSound("eliminate"), 1f, 1f); + if (bossBar != null) { + p.hideBossBar(bossBar); + } + } + plugin.getStatsManager().recordElimination(uuid, round); + } + + private void endMatch(UUID winner) { + stateMachine.transition(ArenaPhase.ENDING); + cancelAllTasks(); + if (winner != null) { + Player winnerPlayer = plugin.getServer().getPlayer(winner); + String winnerName = winnerPlayer != null ? winnerPlayer.getName() : "Unknown"; + for (UUID uuid : allParticipants()) { + Player p = plugin.getServer().getPlayer(uuid); + if (p == null) { + continue; + } + p.showTitle(Title.title(plugin.getMessages().get("game.win-title", Map.of("player", winnerName)), + Component.empty())); + plugin.getSoundUtil().play(p, plugin.getConfigManager().getSound("victory"), 1f, 1f); + } + if (winnerPlayer != null) { + spawnCelebration(winnerPlayer); + } + plugin.getStatsManager().recordWin(winner); + plugin.getRewardManager().dispatchWinnerRewards(winnerName, config.getName(), round); + } else { + for (UUID uuid : allParticipants()) { + Player p = plugin.getServer().getPlayer(uuid); + if (p != null) { + p.sendMessage(plugin.getMessages().get("game.no-winner")); + } + } + } + for (UUID uuid : players) { + plugin.getStatsManager().recordGamePlayed(uuid); + } + for (UUID uuid : spectators) { + plugin.getStatsManager().recordGamePlayed(uuid); + } + + BukkitTask endTask = plugin.getServer().getScheduler().runTaskLater(plugin, this::resetToWaiting, + config.getWinEndingDelaySeconds() * 20L); + tasks.add(endTask); + } + + private void spawnCelebration(Player winner) { + try { + for (int i = 0; i < 3; i++) { + org.bukkit.entity.Firework fw = winner.getWorld().spawn(winner.getLocation(), org.bukkit.entity.Firework.class); + org.bukkit.inventory.meta.FireworkMeta meta = fw.getFireworkMeta(); + meta.addEffect(org.bukkit.FireworkEffect.builder() + .withColor(org.bukkit.Color.YELLOW, org.bukkit.Color.LIME) + .with(org.bukkit.FireworkEffect.Type.BALL_LARGE) + .trail(true) + .build()); + meta.setPower(1); + fw.setFireworkMeta(meta); + } + } catch (Exception ignored) { + } + } + + private List allParticipants() { + List all = new ArrayList<>(players); + all.addAll(spectators); + return all; + } + + private void resetToWaiting() { + List all = allParticipants(); + for (UUID uuid : all) { + removePlayer(uuid, true); + } + players.clear(); + spectators.clear(); + if (bossBar != null) { + bossBar.removeViewer(plugin.getServer().getConsoleSender()); + } + floorManager.cancelActiveTask(); + cancelAllTasks(); + round = 0; + stateMachine.transition(ArenaPhase.WAITING); + } + + private void checkForWinner() { + if (getPhase() == ArenaPhase.RUNNING && EliminationLogic.isMatchOver(players.size())) { + cancelAllTasks(); + evaluateEliminations(); + } + } + + private void cancelAllTasks() { + for (BukkitTask task : tasks) { + if (task != null) { + task.cancel(); + } + } + tasks.clear(); + floorManager.cancelActiveTask(); + } + + /** Called on plugin disable / world unload to safely stop everything and restore players. */ + public void shutdown() { + cancelAllTasks(); + List all = allParticipants(); + for (UUID uuid : all) { + Player p = plugin.getServer().getPlayer(uuid); + PlayerSession session = plugin.getSessionManager().get(uuid); + if (session != null && p != null) { + session.getSavedState().restore(p); + } + plugin.getSessionManager().remove(uuid); + } + players.clear(); + spectators.clear(); + } + + private String formatMaterial(Material material) { + String name = material.name().replace("_CONCRETE", "").replace("_", " ").toLowerCase(); + return name.substring(0, 1).toUpperCase() + name.substring(1); + } +} diff --git a/src/main/java/us/tss3/blockparty/arena/ArenaManager.java b/src/main/java/us/tss3/blockparty/arena/ArenaManager.java new file mode 100644 index 0000000..f66ec00 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/arena/ArenaManager.java @@ -0,0 +1,115 @@ +package us.tss3.blockparty.arena; + +import us.tss3.blockparty.BlockPartyPlugin; +import us.tss3.blockparty.config.ArenaConfig; +import us.tss3.blockparty.config.ArenaConfigLoader; +import us.tss3.blockparty.logic.ArenaPhase; + +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +/** Owns the collection of loaded arenas, keyed by lowercase name. */ +public class ArenaManager { + + private final BlockPartyPlugin plugin; + private final ArenaConfigLoader loader; + private final Map arenas = new LinkedHashMap<>(); + + public ArenaManager(BlockPartyPlugin plugin) { + this.plugin = plugin; + this.loader = new ArenaConfigLoader(plugin); + } + + public ArenaConfigLoader getLoader() { + return loader; + } + + public void loadAll() { + for (Arena arena : arenas.values()) { + arena.shutdown(); + } + arenas.clear(); + for (ArenaConfig cfg : loader.loadAll()) { + arenas.put(cfg.getName().toLowerCase(), new Arena(plugin, cfg)); + } + plugin.getLogger().info("Loaded " + arenas.size() + " arena(s)."); + } + + /** Reload config/messages/arenas without disturbing arenas that are RUNNING or ENDING. */ + public void reloadSafely() { + for (Map.Entry entry : arenas.entrySet()) { + Arena arena = entry.getValue(); + if (arena.getPhase() == ArenaPhase.RUNNING || arena.getPhase() == ArenaPhase.ENDING) { + plugin.getLogger().warning("Skipping reload of arena '" + arena.getConfig().getName() + "' - match in progress."); + continue; + } + ArenaConfig fresh = loader.load(new java.io.File(loader.getArenasFolder(), arena.getConfig().getName() + ".yml")); + if (fresh != null) { + arenas.put(entry.getKey(), new Arena(plugin, fresh)); + } + } + // Load any brand-new arena files not currently tracked + for (ArenaConfig cfg : loader.loadAll()) { + arenas.putIfAbsent(cfg.getName().toLowerCase(), new Arena(plugin, cfg)); + } + } + + public Optional get(String name) { + if (name == null) { + return Optional.empty(); + } + return Optional.ofNullable(arenas.get(name.toLowerCase())); + } + + public boolean exists(String name) { + return arenas.containsKey(name.toLowerCase()); + } + + public Arena createArena(String name, org.bukkit.World world) { + ArenaConfig cfg = new ArenaConfig(name); + if (world != null) { + cfg.setWorldName(world.getName()); + } + cfg.setFloorMaterials(plugin.getConfigManager().getDefaultFloorMaterials().stream() + .map(org.bukkit.Material::matchMaterial) + .filter(java.util.Objects::nonNull) + .toList()); + cfg.setStartingRoundTime(plugin.getConfigManager().getDefaultStartingRoundTime()); + cfg.setMinimumRoundTime(plugin.getConfigManager().getDefaultMinimumRoundTime()); + cfg.setRoundTimeReduction(plugin.getConfigManager().getDefaultRoundReduction()); + cfg.setCountdownDuration(plugin.getConfigManager().getDefaultCountdown()); + loader.save(cfg); + Arena arena = new Arena(plugin, cfg); + arenas.put(name.toLowerCase(), arena); + return arena; + } + + public boolean deleteArena(String name) { + Arena arena = arenas.remove(name.toLowerCase()); + if (arena != null) { + arena.shutdown(); + } + return loader.delete(name); + } + + public Collection all() { + return arenas.values(); + } + + public List names() { + return arenas.values().stream().map(a -> a.getConfig().getName()).toList(); + } + + public void save(Arena arena) { + loader.save(arena.getConfig()); + } + + public void shutdownAll() { + for (Arena arena : arenas.values()) { + arena.shutdown(); + } + } +} diff --git a/src/main/java/us/tss3/blockparty/command/BlockPartyCommand.java b/src/main/java/us/tss3/blockparty/command/BlockPartyCommand.java new file mode 100644 index 0000000..5ca09a8 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/command/BlockPartyCommand.java @@ -0,0 +1,407 @@ +package us.tss3.blockparty.command; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabCompleter; +import org.bukkit.entity.Player; +import us.tss3.blockparty.BlockPartyPlugin; +import us.tss3.blockparty.arena.Arena; +import us.tss3.blockparty.config.ArenaConfig; +import us.tss3.blockparty.logic.ArenaPhase; +import us.tss3.blockparty.persistence.PlayerStats; +import us.tss3.blockparty.session.PlayerSession; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; + +/** Single entry-point handling all /blockparty (alias /bp) subcommands. */ +public class BlockPartyCommand implements CommandExecutor, TabCompleter { + + private final BlockPartyPlugin plugin; + + public BlockPartyCommand(BlockPartyPlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (args.length == 0) { + sendHelp(sender); + return true; + } + String sub = args[0].toLowerCase(); + switch (sub) { + case "help" -> sendHelp(sender); + case "create" -> create(sender, args); + case "delete" -> delete(sender, args); + case "enable" -> enable(sender, args); + case "disable" -> disable(sender, args); + case "setlobby" -> setLobby(sender, args); + case "setspawn" -> setSpawn(sender, args); + case "setspectator" -> setSpectator(sender, args); + case "pos1" -> pos1(sender, args); + case "pos2" -> pos2(sender, args); + case "setfloor" -> setFloor(sender, args); + case "generate" -> generate(sender, args); + case "info" -> info(sender, args); + case "list" -> list(sender); + case "reload" -> reload(sender); + case "join" -> join(sender, args); + case "leave" -> leave(sender); + case "arenas" -> list(sender); + case "stats" -> stats(sender, args); + default -> sendHelp(sender); + } + return true; + } + + private void sendHelp(CommandSender sender) { + List lines = List.of( + "/blockparty help", + "/blockparty join ", + "/blockparty leave", + "/blockparty arenas", + "/blockparty stats [player]", + "/blockparty create ", + "/blockparty delete ", + "/blockparty enable ", + "/blockparty disable ", + "/blockparty setlobby ", + "/blockparty setspawn ", + "/blockparty setspectator ", + "/blockparty pos1 ", + "/blockparty pos2 ", + "/blockparty setfloor ", + "/blockparty generate ", + "/blockparty info ", + "/blockparty list", + "/blockparty reload" + ); + sender.sendMessage("§6=== BlockParty Commands ==="); + for (String line : lines) { + sender.sendMessage("§7" + line); + } + } + + private boolean requireAdmin(CommandSender sender, String perm) { + if (!sender.hasPermission(perm) && !sender.hasPermission("blockparty.admin")) { + sender.sendMessage(plugin.getMessages().get("errors.no-permission")); + return false; + } + return true; + } + + private boolean requirePlayer(CommandSender sender) { + if (!(sender instanceof Player)) { + sender.sendMessage("This command can only be used by a player."); + return false; + } + return true; + } + + private String argOrCurrentArenaless(String[] args) { + return args.length > 1 ? args[1] : null; + } + + // -------- admin commands -------- + + private void create(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.create")) return; + String name = argOrCurrentArenaless(args); + if (name == null) { + sender.sendMessage("Usage: /blockparty create "); + return; + } + if (plugin.getArenaManager().exists(name)) { + sender.sendMessage(plugin.getMessages().get("admin.arena-exists", Map.of("arena", name))); + return; + } + org.bukkit.World world = sender instanceof Player p ? p.getWorld() : Bukkit.getWorlds().get(0); + plugin.getArenaManager().createArena(name, world); + sender.sendMessage(plugin.getMessages().get("admin.arena-created", Map.of("arena", name))); + } + + private void delete(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.delete")) return; + String name = argOrCurrentArenaless(args); + if (name == null || !plugin.getArenaManager().exists(name)) { + sender.sendMessage(plugin.getMessages().get("errors.unknown-arena", Map.of("arena", String.valueOf(name)))); + return; + } + plugin.getArenaManager().deleteArena(name); + sender.sendMessage(plugin.getMessages().get("admin.arena-deleted", Map.of("arena", name))); + } + + private void enable(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup")) return; + withArena(sender, args, arena -> { + List errors = plugin.getArenaManager().getLoader().validate(arena.getConfig()); + if (!errors.isEmpty()) { + sender.sendMessage(plugin.getMessages().get("admin.validation-failed", Map.of("arena", arena.getConfig().getName()))); + for (String e : errors) { + sender.sendMessage("§c - " + e); + } + return; + } + arena.enable(); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.arena-enabled", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void disable(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup")) return; + withArena(sender, args, arena -> { + arena.disable(); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.arena-disabled", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void setLobby(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup") || !requirePlayer(sender)) return; + withArena(sender, args, arena -> { + arena.getConfig().setLobby(((Player) sender).getLocation()); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.lobby-set", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void setSpawn(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup") || !requirePlayer(sender)) return; + withArena(sender, args, arena -> { + arena.getConfig().setSpawn(((Player) sender).getLocation()); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.spawn-set", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void setSpectator(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup") || !requirePlayer(sender)) return; + withArena(sender, args, arena -> { + arena.getConfig().setSpectator(((Player) sender).getLocation()); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.spectator-set", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void pos1(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup") || !requirePlayer(sender)) return; + withArena(sender, args, arena -> { + Location loc = ((Player) sender).getLocation(); + arena.getConfig().setPos1(new int[]{loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()}); + arena.getConfig().setWorldName(loc.getWorld().getName()); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.pos1-set", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void pos2(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup") || !requirePlayer(sender)) return; + withArena(sender, args, arena -> { + Location loc = ((Player) sender).getLocation(); + arena.getConfig().setPos2(new int[]{loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()}); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.pos2-set", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void setFloor(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup")) return; + // /bp setfloor + String name = argOrCurrentArenaless(args); + if (name == null || args.length < 3) { + sender.sendMessage("Usage: /blockparty setfloor "); + return; + } + var opt = plugin.getArenaManager().get(name); + if (opt.isEmpty()) { + sender.sendMessage(plugin.getMessages().get("errors.unknown-arena", Map.of("arena", name))); + return; + } + Arena arena = opt.get(); + List materials = new ArrayList<>(); + for (String matName : args[2].split(",")) { + org.bukkit.Material mat = org.bukkit.Material.matchMaterial(matName); + if (mat == null) { + sender.sendMessage("§cInvalid material skipped: " + matName); + continue; + } + materials.add(mat); + } + arena.getConfig().setFloorMaterials(materials); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.floor-set", Map.of("arena", name, "count", String.valueOf(materials.size())))); + } + + private void generate(CommandSender sender, String[] args) { + if (!requireAdmin(sender, "blockparty.admin.setup")) return; + withArena(sender, args, arena -> { + if (!arena.getConfig().hasFloorRegion()) { + sender.sendMessage(plugin.getMessages().get("errors.no-region", Map.of("arena", arena.getConfig().getName()))); + return; + } + if (arena.getConfig().getFloorMaterials().isEmpty()) { + sender.sendMessage(plugin.getMessages().get("errors.no-materials", Map.of("arena", arena.getConfig().getName()))); + return; + } + arena.getFloorManager().generate(new java.util.Random()); + plugin.getArenaManager().save(arena); + sender.sendMessage(plugin.getMessages().get("admin.floor-generated", Map.of("arena", arena.getConfig().getName()))); + }); + } + + private void info(CommandSender sender, String[] args) { + String name = argOrCurrentArenaless(args); + if (name == null) { + sender.sendMessage("Usage: /blockparty info "); + return; + } + var opt = plugin.getArenaManager().get(name); + if (opt.isEmpty()) { + sender.sendMessage(plugin.getMessages().get("errors.unknown-arena", Map.of("arena", name))); + return; + } + Arena arena = opt.get(); + ArenaConfig cfg = arena.getConfig(); + sender.sendMessage("§6=== Arena: " + cfg.getName() + " ==="); + sender.sendMessage("§7State: §f" + arena.getPhase()); + sender.sendMessage("§7World: §f" + cfg.getWorldName()); + sender.sendMessage("§7Players: §f" + arena.getPlayers().size() + "/" + cfg.getMaxPlayers() + " (min " + cfg.getMinPlayers() + ")"); + sender.sendMessage("§7Lobby set: §f" + (cfg.getLobby() != null)); + sender.sendMessage("§7Spawn set: §f" + (cfg.getSpawn() != null)); + sender.sendMessage("§7Spectator set: §f" + (cfg.getSpectator() != null)); + sender.sendMessage("§7Floor region set: §f" + cfg.hasFloorRegion()); + sender.sendMessage("§7Floor generated: §f" + cfg.hasGeneratedLayout()); + sender.sendMessage("§7Floor materials: §f" + cfg.getFloorMaterials().size()); + List errors = plugin.getArenaManager().getLoader().validate(cfg); + sender.sendMessage("§7Valid: §f" + errors.isEmpty()); + for (String e : errors) { + sender.sendMessage("§c - " + e); + } + } + + private void list(CommandSender sender) { + sender.sendMessage("§6=== Arenas ==="); + for (Arena arena : plugin.getArenaManager().all()) { + sender.sendMessage("§7- " + arena.getConfig().getName() + " §8(" + arena.getPhase() + ", " + + arena.getPlayers().size() + "/" + arena.getConfig().getMaxPlayers() + ")"); + } + } + + private void reload(CommandSender sender) { + if (!requireAdmin(sender, "blockparty.admin.reload")) return; + plugin.reloadEverything(); + sender.sendMessage(plugin.getMessages().get("admin.reloaded")); + } + + // -------- player commands -------- + + private void join(CommandSender sender, String[] args) { + if (!requirePlayer(sender)) return; + if (!sender.hasPermission("blockparty.join") && !sender.hasPermission("blockparty.play")) { + sender.sendMessage(plugin.getMessages().get("errors.no-permission")); + return; + } + Player player = (Player) sender; + String name = argOrCurrentArenaless(args); + if (name == null) { + sender.sendMessage("Usage: /blockparty join "); + return; + } + var opt = plugin.getArenaManager().get(name); + if (opt.isEmpty()) { + sender.sendMessage(plugin.getMessages().get("errors.unknown-arena", Map.of("arena", name))); + return; + } + Arena arena = opt.get(); + if (plugin.getSessionManager().isInSession(player.getUniqueId())) { + sender.sendMessage(plugin.getMessages().get("errors.already-in-arena")); + return; + } + if (!arena.isEnabled()) { + sender.sendMessage(plugin.getMessages().get("errors.arena-disabled", Map.of("arena", name))); + return; + } + if (!arena.canJoin()) { + sender.sendMessage(plugin.getMessages().get("errors.arena-full", Map.of("arena", name))); + return; + } + arena.addPlayer(player); + plugin.getSoundUtil().play(player, plugin.getConfigManager().getSound("join"), 1f, 1f); + sender.sendMessage(plugin.getMessages().get("player.joined", Map.of("arena", name))); + } + + private void leave(CommandSender sender) { + if (!requirePlayer(sender)) return; + Player player = (Player) sender; + PlayerSession session = plugin.getSessionManager().get(player.getUniqueId()); + if (session == null) { + sender.sendMessage(plugin.getMessages().get("errors.not-in-arena")); + return; + } + plugin.getArenaManager().get(session.getArenaName()).ifPresent(arena -> arena.removePlayer(player.getUniqueId(), true)); + sender.sendMessage(plugin.getMessages().get("player.left")); + } + + private void stats(CommandSender sender, String[] args) { + UUID target; + String targetName; + if (args.length > 1) { + org.bukkit.OfflinePlayer off = Bukkit.getOfflinePlayer(args[1]); + target = off.getUniqueId(); + targetName = off.getName() != null ? off.getName() : args[1]; + } else { + if (!requirePlayer(sender)) return; + target = ((Player) sender).getUniqueId(); + targetName = sender.getName(); + } + String finalName = targetName; + plugin.getStatsManager().getStats(target).thenAccept(stats -> + Bukkit.getScheduler().runTask(plugin, () -> sendStats(sender, finalName, stats))); + } + + private void sendStats(CommandSender sender, String name, PlayerStats stats) { + sender.sendMessage("§6=== Stats: " + name + " ==="); + sender.sendMessage("§7Games played: §f" + stats.getGamesPlayed()); + sender.sendMessage("§7Wins: §f" + stats.getWins()); + sender.sendMessage("§7Eliminations: §f" + stats.getEliminations()); + sender.sendMessage("§7Best round: §f" + stats.getBestRound()); + sender.sendMessage("§7Total rounds survived: §f" + stats.getTotalRoundsSurvived()); + } + + private void withArena(CommandSender sender, String[] args, java.util.function.Consumer consumer) { + String name = argOrCurrentArenaless(args); + if (name == null) { + sender.sendMessage("Usage: /blockparty "); + return; + } + var opt = plugin.getArenaManager().get(name); + if (opt.isEmpty()) { + sender.sendMessage(plugin.getMessages().get("errors.unknown-arena", Map.of("arena", name))); + return; + } + consumer.accept(opt.get()); + } + + @Override + public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { + if (args.length == 1) { + return List.of("help", "join", "leave", "arenas", "stats", "create", "delete", "enable", "disable", + "setlobby", "setspawn", "setspectator", "pos1", "pos2", "setfloor", "generate", "info", "list", "reload") + .stream().filter(s -> s.startsWith(args[0].toLowerCase())).collect(Collectors.toList()); + } + if (args.length == 2) { + return plugin.getArenaManager().names().stream() + .filter(n -> n.toLowerCase().startsWith(args[1].toLowerCase())) + .collect(Collectors.toList()); + } + return new ArrayList<>(); + } +} diff --git a/src/main/java/us/tss3/blockparty/config/ArenaConfig.java b/src/main/java/us/tss3/blockparty/config/ArenaConfig.java new file mode 100644 index 0000000..2693b81 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/config/ArenaConfig.java @@ -0,0 +1,230 @@ +package us.tss3.blockparty.config; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; + +import java.util.ArrayList; +import java.util.List; + +/** Mutable POJO describing a single arena's configuration, mirrors arenas/.yml. */ +public class ArenaConfig { + + private String name; + private String worldName; + private Location lobby; + private Location spawn; + private Location spectator; + private int[] pos1; // x,y,z block coords + private int[] pos2; + + private int minPlayers = 2; + private int maxPlayers = 16; + private int countdownDuration = 15; + private int roundPrepDuration = 5; + private int floorRemoveDelaySeconds = 1; + private int floorRestoreDelaySeconds = 3; + private int startingRoundTime = 20; + private int minimumRoundTime = 4; + private int roundTimeReduction = 1; + private int winEndingDelaySeconds = 6; + + private List floorMaterials = new ArrayList<>(); + private boolean allowJoinWhileStarting = true; + private boolean spectatorsAllowed = true; + private boolean enabled = false; + + /** flat serialized layout: "x,y,z,MATERIAL" per generated block, empty until /bp generate */ + private List generatedLayout = new ArrayList<>(); + + public ArenaConfig(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public String getWorldName() { + return worldName; + } + + public void setWorldName(String worldName) { + this.worldName = worldName; + } + + public World getWorld() { + return worldName == null ? null : org.bukkit.Bukkit.getWorld(worldName); + } + + public Location getLobby() { + return lobby; + } + + public void setLobby(Location lobby) { + this.lobby = lobby; + if (lobby != null && lobby.getWorld() != null) { + this.worldName = lobby.getWorld().getName(); + } + } + + public Location getSpawn() { + return spawn; + } + + public void setSpawn(Location spawn) { + this.spawn = spawn; + } + + public Location getSpectator() { + return spectator; + } + + public void setSpectator(Location spectator) { + this.spectator = spectator; + } + + public int[] getPos1() { + return pos1; + } + + public void setPos1(int[] pos1) { + this.pos1 = pos1; + } + + public int[] getPos2() { + return pos2; + } + + public void setPos2(int[] pos2) { + this.pos2 = pos2; + } + + public boolean hasFloorRegion() { + return pos1 != null && pos2 != null; + } + + public int getMinPlayers() { + return minPlayers; + } + + public void setMinPlayers(int minPlayers) { + this.minPlayers = minPlayers; + } + + public int getMaxPlayers() { + return maxPlayers; + } + + public void setMaxPlayers(int maxPlayers) { + this.maxPlayers = maxPlayers; + } + + public int getCountdownDuration() { + return countdownDuration; + } + + public void setCountdownDuration(int countdownDuration) { + this.countdownDuration = countdownDuration; + } + + public int getRoundPrepDuration() { + return roundPrepDuration; + } + + public void setRoundPrepDuration(int roundPrepDuration) { + this.roundPrepDuration = roundPrepDuration; + } + + public int getFloorRemoveDelaySeconds() { + return floorRemoveDelaySeconds; + } + + public void setFloorRemoveDelaySeconds(int floorRemoveDelaySeconds) { + this.floorRemoveDelaySeconds = floorRemoveDelaySeconds; + } + + public int getFloorRestoreDelaySeconds() { + return floorRestoreDelaySeconds; + } + + public void setFloorRestoreDelaySeconds(int floorRestoreDelaySeconds) { + this.floorRestoreDelaySeconds = floorRestoreDelaySeconds; + } + + public int getStartingRoundTime() { + return startingRoundTime; + } + + public void setStartingRoundTime(int startingRoundTime) { + this.startingRoundTime = startingRoundTime; + } + + public int getMinimumRoundTime() { + return minimumRoundTime; + } + + public void setMinimumRoundTime(int minimumRoundTime) { + this.minimumRoundTime = minimumRoundTime; + } + + public int getRoundTimeReduction() { + return roundTimeReduction; + } + + public void setRoundTimeReduction(int roundTimeReduction) { + this.roundTimeReduction = roundTimeReduction; + } + + public int getWinEndingDelaySeconds() { + return winEndingDelaySeconds; + } + + public void setWinEndingDelaySeconds(int winEndingDelaySeconds) { + this.winEndingDelaySeconds = winEndingDelaySeconds; + } + + public List getFloorMaterials() { + return floorMaterials; + } + + public void setFloorMaterials(List floorMaterials) { + this.floorMaterials = floorMaterials; + } + + public boolean isAllowJoinWhileStarting() { + return allowJoinWhileStarting; + } + + public void setAllowJoinWhileStarting(boolean allowJoinWhileStarting) { + this.allowJoinWhileStarting = allowJoinWhileStarting; + } + + public boolean isSpectatorsAllowed() { + return spectatorsAllowed; + } + + public void setSpectatorsAllowed(boolean spectatorsAllowed) { + this.spectatorsAllowed = spectatorsAllowed; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public List getGeneratedLayout() { + return generatedLayout; + } + + public void setGeneratedLayout(List generatedLayout) { + this.generatedLayout = generatedLayout; + } + + public boolean hasGeneratedLayout() { + return generatedLayout != null && !generatedLayout.isEmpty(); + } +} diff --git a/src/main/java/us/tss3/blockparty/config/ArenaConfigLoader.java b/src/main/java/us/tss3/blockparty/config/ArenaConfigLoader.java new file mode 100644 index 0000000..00a56de --- /dev/null +++ b/src/main/java/us/tss3/blockparty/config/ArenaConfigLoader.java @@ -0,0 +1,177 @@ +package us.tss3.blockparty.config; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.plugin.Plugin; +import us.tss3.blockparty.logic.ArenaConfigValidator; +import us.tss3.blockparty.util.LocationUtil; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; + +/** Loads/saves individual arena yml files. Each arena is loaded independently; a bad file is logged and skipped. */ +public class ArenaConfigLoader { + + private final Plugin plugin; + private final File arenasFolder; + + public ArenaConfigLoader(Plugin plugin) { + this.plugin = plugin; + this.arenasFolder = new File(plugin.getDataFolder(), "arenas"); + if (!arenasFolder.exists()) { + arenasFolder.mkdirs(); + } + } + + public File getArenasFolder() { + return arenasFolder; + } + + public List loadAll() { + List arenas = new ArrayList<>(); + File[] files = arenasFolder.listFiles((dir, name) -> name.endsWith(".yml")); + if (files == null) { + return arenas; + } + for (File file : files) { + try { + ArenaConfig cfg = load(file); + if (cfg != null) { + arenas.add(cfg); + } + } catch (Exception ex) { + plugin.getLogger().log(Level.WARNING, "Failed to load arena file " + file.getName() + ": " + ex.getMessage(), ex); + } + } + return arenas; + } + + public ArenaConfig load(File file) { + String name = file.getName().replace(".yml", ""); + YamlConfiguration yml = YamlConfiguration.loadConfiguration(file); + ArenaConfig cfg = new ArenaConfig(name); + cfg.setWorldName(yml.getString("world")); + cfg.setLobby(LocationUtil.fromSection(yml.getConfigurationSection("lobby"))); + cfg.setSpawn(LocationUtil.fromSection(yml.getConfigurationSection("spawn"))); + cfg.setSpectator(LocationUtil.fromSection(yml.getConfigurationSection("spectator"))); + if (yml.contains("pos1")) { + cfg.setPos1(new int[]{yml.getInt("pos1.x"), yml.getInt("pos1.y"), yml.getInt("pos1.z")}); + } + if (yml.contains("pos2")) { + cfg.setPos2(new int[]{yml.getInt("pos2.x"), yml.getInt("pos2.y"), yml.getInt("pos2.z")}); + } + cfg.setMinPlayers(yml.getInt("min-players", 2)); + cfg.setMaxPlayers(yml.getInt("max-players", 16)); + cfg.setCountdownDuration(yml.getInt("countdown-duration", 15)); + cfg.setRoundPrepDuration(yml.getInt("round-prep-duration", 5)); + cfg.setFloorRemoveDelaySeconds(yml.getInt("floor-remove-delay", 1)); + cfg.setFloorRestoreDelaySeconds(yml.getInt("floor-restore-delay", 3)); + cfg.setStartingRoundTime(yml.getInt("starting-round-time", 20)); + cfg.setMinimumRoundTime(yml.getInt("minimum-round-time", 4)); + cfg.setRoundTimeReduction(yml.getInt("round-time-reduction", 1)); + cfg.setWinEndingDelaySeconds(yml.getInt("win-ending-delay", 6)); + cfg.setAllowJoinWhileStarting(yml.getBoolean("allow-join-while-waiting", true)); + cfg.setSpectatorsAllowed(yml.getBoolean("spectators-allowed", true)); + cfg.setEnabled(yml.getBoolean("enabled", false)); + + List materials = new ArrayList<>(); + for (String matName : yml.getStringList("floor-materials")) { + Material mat = Material.matchMaterial(matName); + if (mat == null) { + plugin.getLogger().warning("Arena '" + name + "': invalid floor material '" + matName + "' skipped."); + continue; + } + materials.add(mat); + } + cfg.setFloorMaterials(materials); + cfg.setGeneratedLayout(yml.getStringList("generated-layout")); + return cfg; + } + + public void save(ArenaConfig cfg) { + File file = new File(arenasFolder, cfg.getName() + ".yml"); + YamlConfiguration yml = new YamlConfiguration(); + if (cfg.getWorldName() != null) { + yml.set("world", cfg.getWorldName()); + } + if (cfg.getLobby() != null) { + LocationUtil.toSection(yml.createSection("lobby"), cfg.getLobby()); + } + if (cfg.getSpawn() != null) { + LocationUtil.toSection(yml.createSection("spawn"), cfg.getSpawn()); + } + if (cfg.getSpectator() != null) { + LocationUtil.toSection(yml.createSection("spectator"), cfg.getSpectator()); + } + if (cfg.getPos1() != null) { + yml.set("pos1.x", cfg.getPos1()[0]); + yml.set("pos1.y", cfg.getPos1()[1]); + yml.set("pos1.z", cfg.getPos1()[2]); + } + if (cfg.getPos2() != null) { + yml.set("pos2.x", cfg.getPos2()[0]); + yml.set("pos2.y", cfg.getPos2()[1]); + yml.set("pos2.z", cfg.getPos2()[2]); + } + yml.set("min-players", cfg.getMinPlayers()); + yml.set("max-players", cfg.getMaxPlayers()); + yml.set("countdown-duration", cfg.getCountdownDuration()); + yml.set("round-prep-duration", cfg.getRoundPrepDuration()); + yml.set("floor-remove-delay", cfg.getFloorRemoveDelaySeconds()); + yml.set("floor-restore-delay", cfg.getFloorRestoreDelaySeconds()); + yml.set("starting-round-time", cfg.getStartingRoundTime()); + yml.set("minimum-round-time", cfg.getMinimumRoundTime()); + yml.set("round-time-reduction", cfg.getRoundTimeReduction()); + yml.set("win-ending-delay", cfg.getWinEndingDelaySeconds()); + yml.set("allow-join-while-waiting", cfg.isAllowJoinWhileStarting()); + yml.set("spectators-allowed", cfg.isSpectatorsAllowed()); + yml.set("enabled", cfg.isEnabled()); + List matNames = new ArrayList<>(); + for (Material m : cfg.getFloorMaterials()) { + matNames.add(m.name()); + } + yml.set("floor-materials", matNames); + yml.set("generated-layout", cfg.getGeneratedLayout()); + try { + yml.save(file); + } catch (Exception ex) { + plugin.getLogger().log(Level.SEVERE, "Failed to save arena " + cfg.getName(), ex); + } + } + + public boolean delete(String name) { + File file = new File(arenasFolder, name + ".yml"); + return file.exists() && file.delete(); + } + + public List validate(ArenaConfig cfg) { + boolean worldOk = cfg.getWorldName() != null && Bukkit.getWorld(cfg.getWorldName()) != null; + ArenaConfigValidator.Fields fields = new ArenaConfigValidator.Fields( + cfg.getName(), + worldOk ? cfg.getWorldName() : null, + cfg.getLobby() != null, + cfg.getSpawn() != null, + cfg.getSpectator() != null, + cfg.hasFloorRegion(), + cfg.getMinPlayers(), + cfg.getMaxPlayers(), + cfg.getCountdownDuration(), + cfg.getRoundPrepDuration(), + cfg.getFloorRemoveDelaySeconds(), + cfg.getFloorRestoreDelaySeconds(), + cfg.getStartingRoundTime(), + cfg.getMinimumRoundTime(), + cfg.getRoundTimeReduction(), + cfg.getWinEndingDelaySeconds(), + cfg.getFloorMaterials().stream().map(Material::name).toList() + ); + List errors = new ArrayList<>(ArenaConfigValidator.validate(fields)); + if (!worldOk && cfg.getWorldName() != null) { + errors.add("world '" + cfg.getWorldName() + "' is not currently loaded"); + } + return errors; + } +} diff --git a/src/main/java/us/tss3/blockparty/config/ConfigManager.java b/src/main/java/us/tss3/blockparty/config/ConfigManager.java new file mode 100644 index 0000000..cae4d2a --- /dev/null +++ b/src/main/java/us/tss3/blockparty/config/ConfigManager.java @@ -0,0 +1,83 @@ +package us.tss3.blockparty.config; + +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +import java.util.List; + +/** Wraps global config.yml access: UI toggles, sounds, rewards, default floor palette. */ +public class ConfigManager { + + private final JavaPlugin plugin; + private FileConfiguration config; + + public ConfigManager(JavaPlugin plugin) { + this.plugin = plugin; + } + + public void load() { + plugin.saveDefaultConfig(); + plugin.reloadConfig(); + this.config = plugin.getConfig(); + } + + public FileConfiguration raw() { + return config; + } + + public boolean isScoreboardEnabled() { + return config.getBoolean("ui.scoreboard", true); + } + + public boolean isBossbarEnabled() { + return config.getBoolean("ui.bossbar", true); + } + + public boolean isTitlesEnabled() { + return config.getBoolean("ui.titles", true); + } + + public boolean isActionbarEnabled() { + return config.getBoolean("ui.actionbar", true); + } + + public int getScoreboardUpdateIntervalTicks() { + return config.getInt("ui.scoreboard-update-interval-ticks", 10); + } + + public String getSound(String key) { + return config.getString("sounds." + key); + } + + public List getRewardCommands() { + return config.getStringList("rewards.winner.commands"); + } + + public List getDefaultFloorMaterials() { + return config.getStringList("default-floor-materials"); + } + + public int getDefaultStartingRoundTime() { + return config.getInt("defaults.starting-round-time", 20); + } + + public int getDefaultMinimumRoundTime() { + return config.getInt("defaults.minimum-round-time", 4); + } + + public int getDefaultRoundReduction() { + return config.getInt("defaults.round-time-reduction", 1); + } + + public int getDefaultCountdown() { + return config.getInt("defaults.countdown-duration", 15); + } + + public int getFloorBatchBlocksPerTick() { + return config.getInt("performance.floor-blocks-per-tick", 200); + } + + public boolean isPlaceholderApiEnabled() { + return config.getBoolean("integrations.placeholderapi", true); + } +} diff --git a/src/main/java/us/tss3/blockparty/config/MessagesManager.java b/src/main/java/us/tss3/blockparty/config/MessagesManager.java new file mode 100644 index 0000000..92519b6 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/config/MessagesManager.java @@ -0,0 +1,77 @@ +package us.tss3.blockparty.config; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +/** Loads messages.yml and renders MiniMessage strings with placeholder substitution. */ +public class MessagesManager { + + private final JavaPlugin plugin; + private final MiniMessage miniMessage = MiniMessage.miniMessage(); + private YamlConfiguration messages; + + public MessagesManager(JavaPlugin plugin) { + this.plugin = plugin; + } + + public void load() { + File file = new File(plugin.getDataFolder(), "messages.yml"); + if (!file.exists()) { + plugin.saveResource("messages.yml", false); + } + messages = YamlConfiguration.loadConfiguration(file); + // fill defaults from jar for any missing keys + try (InputStream in = plugin.getResource("messages.yml")) { + if (in != null) { + YamlConfiguration defaults = YamlConfiguration.loadConfiguration(new InputStreamReader(in, StandardCharsets.UTF_8)); + messages.setDefaults(defaults); + } + } catch (IOException ignored) { + } + } + + public String raw(String key) { + String value = messages.getString(key); + if (value == null) { + return "Missing message: " + key + ""; + } + return value; + } + + public Component get(String key) { + return miniMessage.deserialize(raw(key)); + } + + public Component get(String key, Map placeholders) { + String value = raw(key); + for (Map.Entry e : placeholders.entrySet()) { + value = value.replace("%" + e.getKey() + "%", e.getValue()); + } + return miniMessage.deserialize(value); + } + + public String getPlain(String key, Map placeholders) { + String value = raw(key); + for (Map.Entry e : placeholders.entrySet()) { + value = value.replace("%" + e.getKey() + "%", e.getValue()); + } + return value; + } + + public MiniMessage miniMessage() { + return miniMessage; + } + + public java.util.List rawList(String key) { + return messages.getStringList(key); + } +} diff --git a/src/main/java/us/tss3/blockparty/floor/FloorManager.java b/src/main/java/us/tss3/blockparty/floor/FloorManager.java new file mode 100644 index 0000000..78c2b15 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/floor/FloorManager.java @@ -0,0 +1,229 @@ +package us.tss3.blockparty.floor; + +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.plugin.Plugin; +import org.bukkit.scheduler.BukkitTask; +import us.tss3.blockparty.config.ArenaConfig; + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + +/** + * Handles floor generation/removal/restoration for a single arena, batching block mutations + * across ticks so a large floor never causes a watchdog-tripping synchronous loop. + */ +public class FloorManager { + + private final Plugin plugin; + private final ArenaConfig config; + /** location key "x,y,z" -> material, the canonical generated layout */ + private final Map layout = new HashMap<>(); + private BukkitTask activeTask; + + public FloorManager(Plugin plugin, ArenaConfig config) { + this.plugin = plugin; + this.config = config; + loadLayoutFromConfig(); + } + + private void loadLayoutFromConfig() { + layout.clear(); + for (String entry : config.getGeneratedLayout()) { + String[] parts = entry.split(","); + if (parts.length != 4) { + continue; + } + try { + String key = parts[0] + "," + parts[1] + "," + parts[2]; + Material mat = Material.matchMaterial(parts[3]); + if (mat != null) { + layout.put(key, mat); + } + } catch (Exception ignored) { + } + } + } + + public boolean hasLayout() { + return !layout.isEmpty(); + } + + /** Generates a random layout across the region and persists it into the arena config (does not save to disk itself). */ + public void generate(Random random) { + if (!config.hasFloorRegion() || config.getFloorMaterials().isEmpty()) { + return; + } + layout.clear(); + List palette = config.getFloorMaterials(); + int[] p1 = config.getPos1(); + int[] p2 = config.getPos2(); + int minX = Math.min(p1[0], p2[0]); + int maxX = Math.max(p1[0], p2[0]); + int minY = Math.min(p1[1], p2[1]); + int maxY = Math.max(p1[1], p2[1]); + int minZ = Math.min(p1[2], p2[2]); + int maxZ = Math.max(p1[2], p2[2]); + for (int x = minX; x <= maxX; x++) { + for (int y = minY; y <= maxY; y++) { + for (int z = minZ; z <= maxZ; z++) { + Material mat = palette.get(random.nextInt(palette.size())); + layout.put(x + "," + y + "," + z, mat); + } + } + } + List serialized = new ArrayList<>(); + for (Map.Entry e : layout.entrySet()) { + serialized.add(e.getKey() + "," + e.getValue().name()); + } + config.setGeneratedLayout(serialized); + } + + public List materialsInLayout() { + return new ArrayList<>(layout.values()); + } + + /** Places every block from the stored layout, batched across ticks. */ + public void restoreFull(int blocksPerTick, Runnable onComplete) { + World world = config.getWorld(); + if (world == null) { + if (onComplete != null) { + onComplete.run(); + } + return; + } + cancelActiveTask(); + Deque> queue = new ArrayDeque<>(layout.entrySet()); + org.bukkit.scheduler.BukkitRunnable runnable = new org.bukkit.scheduler.BukkitRunnable() { + @Override + public void run() { + int processed = 0; + while (processed < blocksPerTick && !queue.isEmpty()) { + Map.Entry entry = queue.poll(); + setBlock(world, entry.getKey(), entry.getValue()); + processed++; + } + if (queue.isEmpty()) { + cancel(); + activeTask = null; + if (onComplete != null) { + onComplete.run(); + } + } + } + }; + activeTask = runnable.runTaskTimer(plugin, 0L, 1L); + } + + /** Removes every block that is not the target material, batched across ticks. */ + public void removeNonTarget(Material target, int blocksPerTick, Runnable onComplete) { + World world = config.getWorld(); + if (world == null) { + if (onComplete != null) { + onComplete.run(); + } + return; + } + cancelActiveTask(); + Deque queue = new ArrayDeque<>(); + for (Map.Entry entry : layout.entrySet()) { + if (entry.getValue() != target) { + queue.add(entry.getKey()); + } + } + org.bukkit.scheduler.BukkitRunnable runnable = new org.bukkit.scheduler.BukkitRunnable() { + @Override + public void run() { + int processed = 0; + while (processed < blocksPerTick && !queue.isEmpty()) { + String key = queue.poll(); + setBlock(world, key, Material.AIR); + processed++; + } + if (queue.isEmpty()) { + cancel(); + activeTask = null; + if (onComplete != null) { + onComplete.run(); + } + } + } + }; + activeTask = runnable.runTaskTimer(plugin, 0L, 1L); + } + + /** Clears the entire floor region to air, batched. */ + public void clearAll(int blocksPerTick, Runnable onComplete) { + World world = config.getWorld(); + if (world == null) { + if (onComplete != null) { + onComplete.run(); + } + return; + } + cancelActiveTask(); + Deque queue = new ArrayDeque<>(layout.keySet()); + org.bukkit.scheduler.BukkitRunnable runnable = new org.bukkit.scheduler.BukkitRunnable() { + @Override + public void run() { + int processed = 0; + while (processed < blocksPerTick && !queue.isEmpty()) { + setBlock(world, queue.poll(), Material.AIR); + processed++; + } + if (queue.isEmpty()) { + cancel(); + activeTask = null; + if (onComplete != null) { + onComplete.run(); + } + } + } + }; + activeTask = runnable.runTaskTimer(plugin, 0L, 1L); + } + + public Material materialAt(World world, int x, int y, int z) { + return layout.get(x + "," + y + "," + z); + } + + public Material materialAtLocation(World world, double x, double y, double z) { + // check the block directly below the player's feet + int bx = (int) Math.floor(x); + int by = (int) Math.floor(y) - 1; + int bz = (int) Math.floor(z); + Material stored = layout.get(bx + "," + by + "," + bz); + if (stored == null) { + return null; + } + Block block = world.getBlockAt(bx, by, bz); + if (block.getType() == Material.AIR) { + return null; + } + return block.getType(); + } + + private void setBlock(World world, String key, Material material) { + String[] parts = key.split(","); + int x = Integer.parseInt(parts[0]); + int y = Integer.parseInt(parts[1]); + int z = Integer.parseInt(parts[2]); + Block block = world.getBlockAt(x, y, z); + if (block.getType() != material) { + block.setType(material, false); + } + } + + public void cancelActiveTask() { + if (activeTask != null) { + activeTask.cancel(); + activeTask = null; + } + } +} diff --git a/src/main/java/us/tss3/blockparty/listener/GameplayRestrictionListener.java b/src/main/java/us/tss3/blockparty/listener/GameplayRestrictionListener.java new file mode 100644 index 0000000..0591f4c --- /dev/null +++ b/src/main/java/us/tss3/blockparty/listener/GameplayRestrictionListener.java @@ -0,0 +1,95 @@ +package us.tss3.blockparty.listener; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.FoodLevelChangeEvent; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.player.PlayerDropItemEvent; +import org.bukkit.event.player.PlayerPickupItemEvent; +import us.tss3.blockparty.BlockPartyPlugin; +import us.tss3.blockparty.session.PlayerSession; + +/** Restricts destructive/interfering actions for participants without touching non-participants elsewhere. */ +public class GameplayRestrictionListener implements Listener { + + private final BlockPartyPlugin plugin; + + public GameplayRestrictionListener(BlockPartyPlugin plugin) { + this.plugin = plugin; + } + + private boolean isParticipant(Player player) { + return plugin.getSessionManager().isInSession(player.getUniqueId()); + } + + @EventHandler(priority = EventPriority.HIGH) + public void onBreak(BlockBreakEvent event) { + if (isParticipant(event.getPlayer())) { + event.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGH) + public void onPlace(BlockPlaceEvent event) { + if (isParticipant(event.getPlayer())) { + event.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGH) + public void onDrop(PlayerDropItemEvent event) { + if (isParticipant(event.getPlayer())) { + event.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGH) + public void onPickup(PlayerPickupItemEvent event) { + if (isParticipant(event.getPlayer())) { + event.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGH) + public void onInventoryClick(InventoryClickEvent event) { + if (event.getWhoClicked() instanceof Player player && isParticipant(player)) { + event.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGH) + public void onDamageByEntity(EntityDamageByEntityEvent event) { + if (event.getEntity() instanceof Player victim && isParticipant(victim)) { + event.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGH) + public void onDamage(EntityDamageEvent event) { + if (event.getEntity() instanceof Player player && isParticipant(player)) { + PlayerSession session = plugin.getSessionManager().get(player.getUniqueId()); + if (session != null && session.getRole() == PlayerSession.Role.SPECTATOR) { + event.setCancelled(true); + return; + } + // allow fall damage / void to be handled by elimination logic normally, but avoid death mid-round: + if (event.getCause() == EntityDamageEvent.DamageCause.VOID) { + event.setCancelled(true); + player.setFallDistance(0); + } + } + } + + @EventHandler(priority = EventPriority.HIGH) + public void onFoodChange(FoodLevelChangeEvent event) { + if (event.getEntity() instanceof Player player && isParticipant(player)) { + event.setCancelled(true); + } + } +} diff --git a/src/main/java/us/tss3/blockparty/listener/PlayerConnectionListener.java b/src/main/java/us/tss3/blockparty/listener/PlayerConnectionListener.java new file mode 100644 index 0000000..2c8e7fe --- /dev/null +++ b/src/main/java/us/tss3/blockparty/listener/PlayerConnectionListener.java @@ -0,0 +1,42 @@ +package us.tss3.blockparty.listener; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.player.PlayerRespawnEvent; +import us.tss3.blockparty.BlockPartyPlugin; +import us.tss3.blockparty.arena.Arena; +import us.tss3.blockparty.session.PlayerSession; + +/** Handles disconnects and respawns during a match, keeping session state consistent. */ +public class PlayerConnectionListener implements Listener { + + private final BlockPartyPlugin plugin; + + public PlayerConnectionListener(BlockPartyPlugin plugin) { + this.plugin = plugin; + } + + @EventHandler + public void onQuit(PlayerQuitEvent event) { + PlayerSession session = plugin.getSessionManager().get(event.getPlayer().getUniqueId()); + if (session == null) { + return; + } + plugin.getArenaManager().get(session.getArenaName()).ifPresent(arena -> + arena.removePlayer(event.getPlayer().getUniqueId(), false)); + } + + @EventHandler + public void onRespawn(PlayerRespawnEvent event) { + PlayerSession session = plugin.getSessionManager().get(event.getPlayer().getUniqueId()); + if (session == null) { + return; + } + plugin.getArenaManager().get(session.getArenaName()).ifPresent(arena -> { + if (arena.getConfig().getSpectator() != null) { + event.setRespawnLocation(arena.getConfig().getSpectator()); + } + }); + } +} diff --git a/src/main/java/us/tss3/blockparty/logic/ArenaConfigValidator.java b/src/main/java/us/tss3/blockparty/logic/ArenaConfigValidator.java new file mode 100644 index 0000000..0400026 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/ArenaConfigValidator.java @@ -0,0 +1,98 @@ +package us.tss3.blockparty.logic; + +import java.util.ArrayList; +import java.util.List; + +/** + * Validates the raw fields of an arena configuration without touching Bukkit types. + * Callers adapt their config objects into a {@link Fields} record. + */ +public final class ArenaConfigValidator { + + private ArenaConfigValidator() { + } + + public record Fields( + String name, + String world, + boolean hasLobby, + boolean hasSpawn, + boolean hasSpectator, + boolean hasFloorCorners, + int minPlayers, + int maxPlayers, + int countdownDuration, + int roundPrepDuration, + int floorRemoveDelay, + int floorRestoreDelay, + int startingRoundTime, + int minimumRoundTime, + int reductionPerRound, + int winEndingDelay, + List floorMaterials + ) { + } + + public static List validate(Fields f) { + List errors = new ArrayList<>(); + if (isBlank(f.name())) { + errors.add("name is missing"); + } + if (isBlank(f.world())) { + errors.add("world is missing or invalid"); + } + if (!f.hasLobby()) { + errors.add("lobby location is not set"); + } + if (!f.hasSpawn()) { + errors.add("spawn location is not set"); + } + if (!f.hasSpectator()) { + errors.add("spectator location is not set"); + } + if (!f.hasFloorCorners()) { + errors.add("floor region (pos1/pos2) is not set"); + } + if (f.minPlayers() < 1) { + errors.add("min-players must be >= 1"); + } + if (f.maxPlayers() < f.minPlayers()) { + errors.add("max-players must be >= min-players"); + } + if (f.countdownDuration() <= 0) { + errors.add("countdown-duration must be > 0"); + } + if (f.roundPrepDuration() < 0) { + errors.add("round-prep-duration must be >= 0"); + } + if (f.floorRemoveDelay() < 0) { + errors.add("floor-remove-delay must be >= 0"); + } + if (f.floorRestoreDelay() < 0) { + errors.add("floor-restore-delay must be >= 0"); + } + if (f.startingRoundTime() <= 0) { + errors.add("starting-round-time must be > 0"); + } + if (f.minimumRoundTime() < 0) { + errors.add("minimum-round-time must be >= 0"); + } + if (f.minimumRoundTime() > f.startingRoundTime()) { + errors.add("minimum-round-time must be <= starting-round-time"); + } + if (f.reductionPerRound() < 0) { + errors.add("round-time-reduction must be >= 0"); + } + if (f.winEndingDelay() < 0) { + errors.add("win-ending-delay must be >= 0"); + } + if (f.floorMaterials() == null || f.floorMaterials().isEmpty()) { + errors.add("floor-materials palette is empty"); + } + return errors; + } + + private static boolean isBlank(String s) { + return s == null || s.isBlank(); + } +} diff --git a/src/main/java/us/tss3/blockparty/logic/ArenaPhase.java b/src/main/java/us/tss3/blockparty/logic/ArenaPhase.java new file mode 100644 index 0000000..74828fe --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/ArenaPhase.java @@ -0,0 +1,10 @@ +package us.tss3.blockparty.logic; + +/** Pure enum representing the lifecycle state of an arena. No Bukkit dependencies. */ +public enum ArenaPhase { + DISABLED, + WAITING, + STARTING, + RUNNING, + ENDING +} diff --git a/src/main/java/us/tss3/blockparty/logic/ArenaStateMachine.java b/src/main/java/us/tss3/blockparty/logic/ArenaStateMachine.java new file mode 100644 index 0000000..3338e57 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/ArenaStateMachine.java @@ -0,0 +1,51 @@ +package us.tss3.blockparty.logic; + +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.Map; +import java.util.Set; + +/** + * Pure state-machine describing legal transitions between {@link ArenaPhase} values. + * No Bukkit dependencies so it can be unit tested directly. + */ +public final class ArenaStateMachine { + + private static final Map> TRANSITIONS = new EnumMap<>(ArenaPhase.class); + + static { + TRANSITIONS.put(ArenaPhase.DISABLED, EnumSet.of(ArenaPhase.WAITING)); + TRANSITIONS.put(ArenaPhase.WAITING, EnumSet.of(ArenaPhase.STARTING, ArenaPhase.DISABLED)); + TRANSITIONS.put(ArenaPhase.STARTING, EnumSet.of(ArenaPhase.RUNNING, ArenaPhase.WAITING, ArenaPhase.DISABLED)); + TRANSITIONS.put(ArenaPhase.RUNNING, EnumSet.of(ArenaPhase.ENDING, ArenaPhase.DISABLED)); + TRANSITIONS.put(ArenaPhase.ENDING, EnumSet.of(ArenaPhase.WAITING, ArenaPhase.DISABLED)); + } + + private ArenaPhase current; + + public ArenaStateMachine() { + this(ArenaPhase.DISABLED); + } + + public ArenaStateMachine(ArenaPhase initial) { + this.current = initial; + } + + public ArenaPhase getState() { + return current; + } + + public boolean canTransition(ArenaPhase target) { + Set allowed = TRANSITIONS.get(current); + return allowed != null && allowed.contains(target); + } + + /** @return true if the transition happened */ + public boolean transition(ArenaPhase target) { + if (!canTransition(target)) { + return false; + } + this.current = target; + return true; + } +} diff --git a/src/main/java/us/tss3/blockparty/logic/CountdownLogic.java b/src/main/java/us/tss3/blockparty/logic/CountdownLogic.java new file mode 100644 index 0000000..6d64a06 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/CountdownLogic.java @@ -0,0 +1,26 @@ +package us.tss3.blockparty.logic; + +/** Pure logic for deciding when a waiting-lobby countdown should start/cancel. */ +public final class CountdownLogic { + + private CountdownLogic() { + } + + public static boolean shouldStart(int currentPlayers, int minPlayers, boolean alreadyCounting) { + return !alreadyCounting && currentPlayers >= minPlayers && minPlayers > 0; + } + + /** Below-min-players cancels an in-progress countdown, resetting to WAITING. */ + public static boolean shouldCancel(int currentPlayers, int minPlayers, boolean currentlyCounting) { + return currentlyCounting && currentPlayers < minPlayers; + } + + /** @return remaining ticks/seconds after decrementing by one, clamped at 0 */ + public static int tick(int remaining) { + return Math.max(0, remaining - 1); + } + + public static boolean isFinished(int remaining) { + return remaining <= 0; + } +} diff --git a/src/main/java/us/tss3/blockparty/logic/EliminationLogic.java b/src/main/java/us/tss3/blockparty/logic/EliminationLogic.java new file mode 100644 index 0000000..4a9f68d --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/EliminationLogic.java @@ -0,0 +1,38 @@ +package us.tss3.blockparty.logic; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** Pure logic for determining eliminations and win conditions given player/material state. */ +public final class EliminationLogic { + + private EliminationLogic() { + } + + public record PlayerFloorState(K playerId, M standingOn) { + } + + /** @return list of player ids standing on a material other than the target (or on nothing) */ + public static List determineEliminated(List> states, M target) { + List eliminated = new ArrayList<>(); + for (PlayerFloorState state : states) { + if (state.standingOn() == null || !state.standingOn().equals(target)) { + eliminated.add(state.playerId()); + } + } + return eliminated; + } + + /** Determines whether the match should end and who the winner is (if any). */ + public static Optional determineWinner(List remainingPlayers) { + if (remainingPlayers.size() == 1) { + return Optional.of(remainingPlayers.get(0)); + } + return Optional.empty(); + } + + public static boolean isMatchOver(int remainingPlayers) { + return remainingPlayers <= 1; + } +} diff --git a/src/main/java/us/tss3/blockparty/logic/PlayerCountLogic.java b/src/main/java/us/tss3/blockparty/logic/PlayerCountLogic.java new file mode 100644 index 0000000..cfc714a --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/PlayerCountLogic.java @@ -0,0 +1,34 @@ +package us.tss3.blockparty.logic; + +/** Pure logic for join/leave-related player count decisions. */ +public final class PlayerCountLogic { + + private PlayerCountLogic() { + } + + public static boolean canJoin(int currentPlayers, int maxPlayers, boolean arenaEnabled, + boolean alreadyInAnotherArena, boolean allowJoinWhileWaiting, + ArenaPhase phase) { + if (!arenaEnabled) { + return false; + } + if (alreadyInAnotherArena) { + return false; + } + if (currentPlayers >= maxPlayers) { + return false; + } + if (phase == ArenaPhase.RUNNING || phase == ArenaPhase.ENDING) { + return false; + } + if (phase == ArenaPhase.STARTING && !allowJoinWhileWaiting) { + return false; + } + return phase == ArenaPhase.WAITING || phase == ArenaPhase.STARTING; + } + + /** A single player alone should never auto-start the match unless min-players is configured as 1. */ + public static boolean autoStartsAlone(int minPlayers) { + return minPlayers <= 1; + } +} diff --git a/src/main/java/us/tss3/blockparty/logic/RoundTimeCalculator.java b/src/main/java/us/tss3/blockparty/logic/RoundTimeCalculator.java new file mode 100644 index 0000000..513a8ea --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/RoundTimeCalculator.java @@ -0,0 +1,29 @@ +package us.tss3.blockparty.logic; + +/** Pure math for computing round time progression across rounds. */ +public final class RoundTimeCalculator { + + private RoundTimeCalculator() { + } + + /** + * @param startingSeconds time for round 1 + * @param minimumSeconds floor value, never go below this + * @param reductionPerRound seconds removed per round after the first + * @param roundNumber 1-indexed round number + */ + public static int timeForRound(int startingSeconds, int minimumSeconds, int reductionPerRound, int roundNumber) { + if (roundNumber < 1) { + roundNumber = 1; + } + long reduction = (long) reductionPerRound * (roundNumber - 1); + long result = startingSeconds - reduction; + if (result < minimumSeconds) { + result = minimumSeconds; + } + if (result < 0) { + result = 0; + } + return (int) result; + } +} diff --git a/src/main/java/us/tss3/blockparty/logic/TargetColorSelector.java b/src/main/java/us/tss3/blockparty/logic/TargetColorSelector.java new file mode 100644 index 0000000..7918b44 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/logic/TargetColorSelector.java @@ -0,0 +1,46 @@ +package us.tss3.blockparty.logic; + +import java.util.List; +import java.util.function.IntUnaryOperator; + +/** + * Selects a random target color/material from a palette using an injectable + * randomness source so behaviour is deterministic in tests. + */ +public final class TargetColorSelector { + + private final IntUnaryOperator boundedRandom; + + /** @param boundedRandom given an exclusive upper bound, returns a value in [0, bound) */ + public TargetColorSelector(IntUnaryOperator boundedRandom) { + this.boundedRandom = boundedRandom; + } + + public T select(List palette) { + if (palette == null || palette.isEmpty()) { + throw new IllegalArgumentException("palette must not be empty"); + } + int index = boundedRandom.applyAsInt(palette.size()); + if (index < 0 || index >= palette.size()) { + index = 0; + } + return palette.get(index); + } + + /** Avoid repeating the immediately previous color when the palette allows it. */ + public T selectExcluding(List palette, T previous) { + if (palette == null || palette.isEmpty()) { + throw new IllegalArgumentException("palette must not be empty"); + } + if (palette.size() == 1 || previous == null) { + return select(palette); + } + T pick = select(palette); + int attempts = 0; + while (pick.equals(previous) && attempts < 8) { + pick = select(palette); + attempts++; + } + return pick; + } +} diff --git a/src/main/java/us/tss3/blockparty/model/PlayerState.java b/src/main/java/us/tss3/blockparty/model/PlayerState.java new file mode 100644 index 0000000..ea5c069 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/model/PlayerState.java @@ -0,0 +1,84 @@ +package us.tss3.blockparty.model; + +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.inventory.ItemStack; +import org.bukkit.potion.PotionEffect; +import org.bukkit.entity.Player; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** Snapshot of a player's pre-game state so it can be restored exactly afterwards. */ +public class PlayerState { + + private final ItemStack[] inventoryContents; + private final ItemStack[] armorContents; + private final ItemStack offhand; + private final double health; + private final int foodLevel; + private final float saturation; + private final double exp; + private final int level; + private final GameMode gameMode; + private final boolean flying; + private final boolean allowFlight; + private final Location location; + private final List potionEffects; + private boolean restored = false; + + private PlayerState(Player player) { + this.inventoryContents = player.getInventory().getContents().clone(); + this.armorContents = player.getInventory().getArmorContents().clone(); + this.offhand = player.getInventory().getItemInOffHand().clone(); + this.health = player.getHealth(); + this.foodLevel = player.getFoodLevel(); + this.saturation = player.getSaturation(); + this.exp = player.getExp(); + this.level = player.getLevel(); + this.gameMode = player.getGameMode(); + this.flying = player.isFlying(); + this.allowFlight = player.getAllowFlight(); + this.location = player.getLocation().clone(); + this.potionEffects = new ArrayList<>(player.getActivePotionEffects()); + } + + public static PlayerState capture(Player player) { + return new PlayerState(player); + } + + /** Idempotent: restoring twice has no additional effect (guards against duplication exploits). */ + public synchronized void restore(Player player) { + if (restored) { + return; + } + restored = true; + player.getInventory().setContents(inventoryContents); + player.getInventory().setArmorContents(armorContents); + player.getInventory().setItemInOffHand(offhand); + player.setGameMode(gameMode); + player.setHealth(Math.min(health, player.getAttribute(org.bukkit.attribute.Attribute.MAX_HEALTH) != null + ? player.getAttribute(org.bukkit.attribute.Attribute.MAX_HEALTH).getValue() : health)); + player.setFoodLevel(foodLevel); + player.setSaturation(saturation); + player.setExp((float) exp); + player.setLevel(level); + player.setAllowFlight(allowFlight); + player.setFlying(flying); + Collection current = new ArrayList<>(player.getActivePotionEffects()); + for (PotionEffect effect : current) { + player.removePotionEffect(effect.getType()); + } + for (PotionEffect effect : potionEffects) { + player.addPotionEffect(effect); + } + if (location.getWorld() != null) { + player.teleport(location); + } + } + + public Location getLocation() { + return location; + } +} diff --git a/src/main/java/us/tss3/blockparty/persistence/PlayerStats.java b/src/main/java/us/tss3/blockparty/persistence/PlayerStats.java new file mode 100644 index 0000000..3b06ad0 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/persistence/PlayerStats.java @@ -0,0 +1,50 @@ +package us.tss3.blockparty.persistence; + +import java.util.UUID; + +public class PlayerStats { + + private final UUID uuid; + private int gamesPlayed; + private int wins; + private int eliminations; + private int bestRound; + private int totalRoundsSurvived; + + public PlayerStats(UUID uuid, int gamesPlayed, int wins, int eliminations, int bestRound, int totalRoundsSurvived) { + this.uuid = uuid; + this.gamesPlayed = gamesPlayed; + this.wins = wins; + this.eliminations = eliminations; + this.bestRound = bestRound; + this.totalRoundsSurvived = totalRoundsSurvived; + } + + public static PlayerStats empty(UUID uuid) { + return new PlayerStats(uuid, 0, 0, 0, 0, 0); + } + + public UUID getUuid() { + return uuid; + } + + public int getGamesPlayed() { + return gamesPlayed; + } + + public int getWins() { + return wins; + } + + public int getEliminations() { + return eliminations; + } + + public int getBestRound() { + return bestRound; + } + + public int getTotalRoundsSurvived() { + return totalRoundsSurvived; + } +} diff --git a/src/main/java/us/tss3/blockparty/persistence/StatsDatabase.java b/src/main/java/us/tss3/blockparty/persistence/StatsDatabase.java new file mode 100644 index 0000000..c5853af --- /dev/null +++ b/src/main/java/us/tss3/blockparty/persistence/StatsDatabase.java @@ -0,0 +1,128 @@ +package us.tss3.blockparty.persistence; + +import org.bukkit.plugin.Plugin; + +import java.io.File; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.UUID; +import java.util.logging.Level; + +/** SQLite-backed statistics storage. All public methods are safe to call from any thread; + * callers are expected to invoke them off the main thread (see StatsManager). */ +public class StatsDatabase { + + private final Plugin plugin; + private Connection connection; + + public StatsDatabase(Plugin plugin) { + this.plugin = plugin; + } + + public synchronized void connect() { + try { + File dbFile = new File(plugin.getDataFolder(), "blockparty.db"); + Class.forName("org.sqlite.JDBC"); + connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile.getAbsolutePath()); + try (Statement st = connection.createStatement()) { + st.execute("CREATE TABLE IF NOT EXISTS player_stats (" + + "uuid TEXT PRIMARY KEY," + + "games_played INTEGER NOT NULL DEFAULT 0," + + "wins INTEGER NOT NULL DEFAULT 0," + + "eliminations INTEGER NOT NULL DEFAULT 0," + + "best_round INTEGER NOT NULL DEFAULT 0," + + "total_rounds_survived INTEGER NOT NULL DEFAULT 0" + + ")"); + } + } catch (Exception ex) { + plugin.getLogger().log(Level.SEVERE, "Failed to initialize SQLite stats database", ex); + } + } + + public synchronized void close() { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException ignored) { + } + } + + private synchronized void ensureRow(String uuid) throws SQLException { + try (PreparedStatement ps = connection.prepareStatement( + "INSERT OR IGNORE INTO player_stats(uuid) VALUES (?)")) { + ps.setString(1, uuid); + ps.executeUpdate(); + } + } + + public synchronized PlayerStats getStats(UUID uuid) { + if (connection == null) { + return PlayerStats.empty(uuid); + } + try { + ensureRow(uuid.toString()); + try (PreparedStatement ps = connection.prepareStatement( + "SELECT games_played, wins, eliminations, best_round, total_rounds_survived FROM player_stats WHERE uuid=?")) { + ps.setString(1, uuid.toString()); + try (ResultSet rs = ps.executeQuery()) { + if (rs.next()) { + return new PlayerStats(uuid, rs.getInt(1), rs.getInt(2), rs.getInt(3), rs.getInt(4), rs.getInt(5)); + } + } + } + } catch (SQLException ex) { + plugin.getLogger().log(Level.WARNING, "Failed to read stats for " + uuid, ex); + } + return PlayerStats.empty(uuid); + } + + public synchronized void incrementGamesPlayed(UUID uuid) { + update(uuid, "games_played = games_played + 1"); + } + + public synchronized void incrementWins(UUID uuid) { + update(uuid, "wins = wins + 1"); + } + + public synchronized void incrementEliminations(UUID uuid) { + update(uuid, "eliminations = eliminations + 1"); + } + + public synchronized void recordRoundReached(UUID uuid, int round) { + if (connection == null) { + return; + } + try { + ensureRow(uuid.toString()); + try (PreparedStatement ps = connection.prepareStatement( + "UPDATE player_stats SET best_round = MAX(best_round, ?), total_rounds_survived = total_rounds_survived + 1 WHERE uuid=?")) { + ps.setInt(1, round); + ps.setString(2, uuid.toString()); + ps.executeUpdate(); + } + } catch (SQLException ex) { + plugin.getLogger().log(Level.WARNING, "Failed to update round stats for " + uuid, ex); + } + } + + private void update(UUID uuid, String setClause) { + if (connection == null) { + return; + } + try { + ensureRow(uuid.toString()); + try (PreparedStatement ps = connection.prepareStatement( + "UPDATE player_stats SET " + setClause + " WHERE uuid=?")) { + ps.setString(1, uuid.toString()); + ps.executeUpdate(); + } + } catch (SQLException ex) { + plugin.getLogger().log(Level.WARNING, "Failed to update stats for " + uuid, ex); + } + } +} diff --git a/src/main/java/us/tss3/blockparty/persistence/StatsManager.java b/src/main/java/us/tss3/blockparty/persistence/StatsManager.java new file mode 100644 index 0000000..d5abb44 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/persistence/StatsManager.java @@ -0,0 +1,51 @@ +package us.tss3.blockparty.persistence; + +import org.bukkit.plugin.Plugin; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; + +/** Async facade over StatsDatabase so callers never block the main thread. */ +public class StatsManager { + + private final Plugin plugin; + private final StatsDatabase database; + + public StatsManager(Plugin plugin) { + this.plugin = plugin; + this.database = new StatsDatabase(plugin); + } + + public void init() { + runAsync(database::connect); + } + + public void shutdown() { + database.close(); + } + + public void recordGamePlayed(UUID uuid) { + runAsync(() -> database.incrementGamesPlayed(uuid)); + } + + public void recordWin(UUID uuid) { + runAsync(() -> database.incrementWins(uuid)); + } + + public void recordElimination(UUID uuid, int round) { + runAsync(() -> { + database.incrementEliminations(uuid); + database.recordRoundReached(uuid, round); + }); + } + + public CompletableFuture getStats(UUID uuid) { + CompletableFuture future = new CompletableFuture<>(); + plugin.getServer().getAsyncScheduler().runNow(plugin, task -> future.complete(database.getStats(uuid))); + return future; + } + + private void runAsync(Runnable runnable) { + plugin.getServer().getAsyncScheduler().runNow(plugin, task -> runnable.run()); + } +} diff --git a/src/main/java/us/tss3/blockparty/placeholder/BlockPartyExpansion.java b/src/main/java/us/tss3/blockparty/placeholder/BlockPartyExpansion.java new file mode 100644 index 0000000..6a53083 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/placeholder/BlockPartyExpansion.java @@ -0,0 +1,80 @@ +package us.tss3.blockparty.placeholder; + +import me.clip.placeholderapi.expansion.PlaceholderExpansion; +import org.bukkit.OfflinePlayer; +import org.jetbrains.annotations.NotNull; +import us.tss3.blockparty.BlockPartyPlugin; +import us.tss3.blockparty.arena.Arena; +import us.tss3.blockparty.persistence.PlayerStats; +import us.tss3.blockparty.session.PlayerSession; + +/** + * PlaceholderAPI expansion. This class references PlaceholderAPI classes directly, so it must + * only ever be loaded/constructed when PlaceholderAPI's plugin jar is confirmed present - + * see BlockPartyPlugin#registerPlaceholderApi. + */ +public class BlockPartyExpansion extends PlaceholderExpansion { + + private final BlockPartyPlugin plugin; + + public BlockPartyExpansion(BlockPartyPlugin plugin) { + this.plugin = plugin; + } + + @Override + public @NotNull String getIdentifier() { + return "blockparty"; + } + + @Override + public @NotNull String getAuthor() { + return "tss3"; + } + + @Override + public @NotNull String getVersion() { + return plugin.getDescription().getVersion(); + } + + @Override + public boolean persist() { + return true; + } + + @Override + public String onRequest(OfflinePlayer player, @NotNull String params) { + if (params.equals("wins") || params.equals("games_played") || params.equals("best_round")) { + if (player == null) { + return "0"; + } + PlayerStats stats; + try { + stats = plugin.getStatsManager().getStats(player.getUniqueId()).get(); + } catch (Exception ex) { + return "0"; + } + return switch (params) { + case "wins" -> String.valueOf(stats.getWins()); + case "games_played" -> String.valueOf(stats.getGamesPlayed()); + case "best_round" -> String.valueOf(stats.getBestRound()); + default -> ""; + }; + } + if (params.equals("arena")) { + if (player == null || player.getUniqueId() == null) { + return ""; + } + PlayerSession session = plugin.getSessionManager().get(player.getUniqueId()); + return session != null ? session.getArenaName() : ""; + } + if (params.startsWith("players_")) { + String arenaName = params.substring("players_".length()); + return plugin.getArenaManager().get(arenaName).map(a -> String.valueOf(a.getPlayers().size())).orElse("0"); + } + if (params.startsWith("state_")) { + String arenaName = params.substring("state_".length()); + return plugin.getArenaManager().get(arenaName).map(Arena::getPhase).map(Enum::name).orElse("UNKNOWN"); + } + return null; + } +} diff --git a/src/main/java/us/tss3/blockparty/reward/RewardManager.java b/src/main/java/us/tss3/blockparty/reward/RewardManager.java new file mode 100644 index 0000000..8e57bec --- /dev/null +++ b/src/main/java/us/tss3/blockparty/reward/RewardManager.java @@ -0,0 +1,27 @@ +package us.tss3.blockparty.reward; + +import org.bukkit.Bukkit; +import us.tss3.blockparty.BlockPartyPlugin; + +import java.util.List; + +/** Dispatches configured console commands as rewards, substituting placeholders. No Vault required. */ +public class RewardManager { + + private final BlockPartyPlugin plugin; + + public RewardManager(BlockPartyPlugin plugin) { + this.plugin = plugin; + } + + public void dispatchWinnerRewards(String playerName, String arenaName, int round) { + List commands = plugin.getConfigManager().getRewardCommands(); + for (String cmd : commands) { + String parsed = cmd.replace("%player%", playerName) + .replace("%arena%", arenaName) + .replace("%round%", String.valueOf(round)); + plugin.getServer().getScheduler().runTask(plugin, () -> + Bukkit.dispatchCommand(Bukkit.getConsoleSender(), parsed)); + } + } +} diff --git a/src/main/java/us/tss3/blockparty/scoreboard/ScoreboardManager.java b/src/main/java/us/tss3/blockparty/scoreboard/ScoreboardManager.java new file mode 100644 index 0000000..5b87f33 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/scoreboard/ScoreboardManager.java @@ -0,0 +1,101 @@ +package us.tss3.blockparty.scoreboard; + +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitTask; +import org.bukkit.scoreboard.DisplaySlot; +import org.bukkit.scoreboard.Objective; +import org.bukkit.scoreboard.Scoreboard; +import us.tss3.blockparty.BlockPartyPlugin; +import us.tss3.blockparty.arena.Arena; +import us.tss3.blockparty.logic.ArenaPhase; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** Maintains a per-player sidebar scoreboard, refreshed on an interval rather than every tick. */ +public class ScoreboardManager { + + private final BlockPartyPlugin plugin; + private final Map attached = new HashMap<>(); + private BukkitTask updateTask; + + public ScoreboardManager(BlockPartyPlugin plugin) { + this.plugin = plugin; + } + + public void start() { + int interval = plugin.getConfigManager().getScoreboardUpdateIntervalTicks(); + updateTask = plugin.getServer().getScheduler().runTaskTimer(plugin, this::updateAll, interval, interval); + } + + public void stop() { + if (updateTask != null) { + updateTask.cancel(); + updateTask = null; + } + } + + public void attach(Player player, Arena arena) { + if (!plugin.getConfigManager().isScoreboardEnabled()) { + return; + } + attached.put(player.getUniqueId(), arena); + render(player, arena); + } + + public void detach(Player player) { + attached.remove(player.getUniqueId()); + player.setScoreboard(plugin.getServer().getScoreboardManager().getNewScoreboard()); + } + + private void updateAll() { + attached.forEach((uuid, arena) -> { + Player p = plugin.getServer().getPlayer(uuid); + if (p != null) { + render(p, arena); + } + }); + } + + private void render(Player player, Arena arena) { + Scoreboard board = plugin.getServer().getScoreboardManager().getNewScoreboard(); + Objective objective = board.registerNewObjective("blockparty", "dummy", + plugin.getMessages().get("scoreboard.title")); + objective.setDisplaySlot(DisplaySlot.SIDEBAR); + + int line = 10; + String targetName = arena.getCurrentTarget() != null + ? arena.getCurrentTarget().name().replace("_CONCRETE", "").replace("_", " ") + : "-"; + Map ph = Map.of( + "arena", arena.getConfig().getName(), + "round", String.valueOf(arena.getRound()), + "players", String.valueOf(arena.getPlayers().size()), + "target", targetName, + "time", String.valueOf(Math.max(0, arena.getRoundTimeRemaining())), + "state", arena.getPhase().name() + ); + for (String rawLine : plugin.getMessages().rawList("scoreboard.lines")) { + String rendered = applyPlaceholders(rawLine, ph); + if (rendered.isBlank()) { + rendered = " ".repeat(line == 10 ? 1 : (10 - line + 1)); + } + objective.getScore(rendered).setScore(line--); + } + player.setScoreboard(board); + } + + private String applyPlaceholders(String text, Map ph) { + String result = text; + for (Map.Entry e : ph.entrySet()) { + result = result.replace("%" + e.getKey() + "%", e.getValue()); + } + // strip minimessage-ish tags crudely for scoreboard (legacy) - scoreboards support limited components on modern paper + return org.bukkit.ChatColor.translateAlternateColorCodes('&', stripMini(result)); + } + + private String stripMini(String s) { + return s.replaceAll("<[^>]+>", ""); + } +} diff --git a/src/main/java/us/tss3/blockparty/session/PlayerSession.java b/src/main/java/us/tss3/blockparty/session/PlayerSession.java new file mode 100644 index 0000000..975f60c --- /dev/null +++ b/src/main/java/us/tss3/blockparty/session/PlayerSession.java @@ -0,0 +1,73 @@ +package us.tss3.blockparty.session; + +import org.bukkit.Material; +import us.tss3.blockparty.model.PlayerState; + +import java.util.UUID; + +/** Per-player session tracking their participation in a single arena match. */ +public class PlayerSession { + + public enum Role { + PLAYER, + SPECTATOR + } + + private final UUID uuid; + private final String arenaName; + private final PlayerState savedState; + private Role role = Role.PLAYER; + private Material standingOn; + private int roundsSurvived = 0; + private boolean eliminated = false; + + public PlayerSession(UUID uuid, String arenaName, PlayerState savedState) { + this.uuid = uuid; + this.arenaName = arenaName; + this.savedState = savedState; + } + + public UUID getUuid() { + return uuid; + } + + public String getArenaName() { + return arenaName; + } + + public PlayerState getSavedState() { + return savedState; + } + + public Role getRole() { + return role; + } + + public void setRole(Role role) { + this.role = role; + } + + public Material getStandingOn() { + return standingOn; + } + + public void setStandingOn(Material standingOn) { + this.standingOn = standingOn; + } + + public int getRoundsSurvived() { + return roundsSurvived; + } + + public void incrementRoundsSurvived() { + roundsSurvived++; + } + + public boolean isEliminated() { + return eliminated; + } + + public void setEliminated(boolean eliminated) { + this.eliminated = eliminated; + } +} diff --git a/src/main/java/us/tss3/blockparty/session/SessionManager.java b/src/main/java/us/tss3/blockparty/session/SessionManager.java new file mode 100644 index 0000000..aa9c4c5 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/session/SessionManager.java @@ -0,0 +1,31 @@ +package us.tss3.blockparty.session; + +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +/** Tracks which arena (if any) each online player is currently in. Enforces single-arena membership. */ +public class SessionManager { + + private final Map sessions = new ConcurrentHashMap<>(); + + public boolean isInSession(UUID uuid) { + return sessions.containsKey(uuid); + } + + public PlayerSession get(UUID uuid) { + return sessions.get(uuid); + } + + public void add(PlayerSession session) { + sessions.put(session.getUuid(), session); + } + + public void remove(UUID uuid) { + sessions.remove(uuid); + } + + public Map all() { + return sessions; + } +} diff --git a/src/main/java/us/tss3/blockparty/util/LocationUtil.java b/src/main/java/us/tss3/blockparty/util/LocationUtil.java new file mode 100644 index 0000000..803db42 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/util/LocationUtil.java @@ -0,0 +1,44 @@ +package us.tss3.blockparty.util; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.configuration.ConfigurationSection; + +public final class LocationUtil { + + private LocationUtil() { + } + + public static Location fromSection(ConfigurationSection section) { + if (section == null) { + return null; + } + String worldName = section.getString("world"); + if (worldName == null) { + return null; + } + World world = Bukkit.getWorld(worldName); + if (world == null) { + return null; + } + double x = section.getDouble("x"); + double y = section.getDouble("y"); + double z = section.getDouble("z"); + float yaw = (float) section.getDouble("yaw"); + float pitch = (float) section.getDouble("pitch"); + return new Location(world, x, y, z, yaw, pitch); + } + + public static void toSection(ConfigurationSection section, Location loc) { + if (loc == null || loc.getWorld() == null) { + return; + } + section.set("world", loc.getWorld().getName()); + section.set("x", loc.getX()); + section.set("y", loc.getY()); + section.set("z", loc.getZ()); + section.set("yaw", (double) loc.getYaw()); + section.set("pitch", (double) loc.getPitch()); + } +} diff --git a/src/main/java/us/tss3/blockparty/util/SoundUtil.java b/src/main/java/us/tss3/blockparty/util/SoundUtil.java new file mode 100644 index 0000000..66dbde0 --- /dev/null +++ b/src/main/java/us/tss3/blockparty/util/SoundUtil.java @@ -0,0 +1,59 @@ +package us.tss3.blockparty.util; + +import org.bukkit.Location; +import org.bukkit.Sound; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; + +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; + +/** Resolves and plays configured sound names safely, warning (not crashing) on invalid names. */ +public final class SoundUtil { + + private final Plugin plugin; + private final Map cache = new HashMap<>(); + private final Map warned = new HashMap<>(); + + public SoundUtil(Plugin plugin) { + this.plugin = plugin; + } + + public void play(Player player, String soundName, float volume, float pitch) { + Sound sound = resolve(soundName); + if (sound == null) { + return; + } + player.playSound(player.getLocation(), sound, volume, pitch); + } + + public void play(Location location, String soundName, float volume, float pitch) { + Sound sound = resolve(soundName); + if (sound == null || location.getWorld() == null) { + return; + } + location.getWorld().playSound(location, sound, volume, pitch); + } + + private Sound resolve(String name) { + if (name == null || name.isBlank()) { + return null; + } + if (cache.containsKey(name)) { + return cache.get(name); + } + try { + Sound sound = Sound.valueOf(name.toUpperCase(java.util.Locale.ROOT)); + cache.put(name, sound); + return sound; + } catch (IllegalArgumentException ex) { + cache.put(name, null); + if (!warned.getOrDefault(name, false)) { + plugin.getLogger().log(Level.WARNING, "Invalid sound name in config: '" + name + "' - skipping."); + warned.put(name, true); + } + return null; + } + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..f0133db --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,55 @@ +# BlockParty global configuration + +ui: + scoreboard: true + bossbar: true + titles: true + actionbar: true + scoreboard-update-interval-ticks: 10 + +sounds: + join: ENTITY_EXPERIENCE_ORB_PICKUP + countdown: BLOCK_NOTE_BLOCK_PLING + target-select: ENTITY_ENDER_DRAGON_GROWL + floor-disappear: ENTITY_GENERIC_EXPLODE + eliminate: ENTITY_VILLAGER_NO + round-complete: BLOCK_NOTE_BLOCK_BELL + victory: UI_TOAST_CHALLENGE_COMPLETE + +performance: + # blocks processed per server tick when generating/removing/restoring the floor + floor-blocks-per-tick: 200 + +# example/default timings used when creating a brand-new arena via /blockparty create +defaults: + countdown-duration: 15 + starting-round-time: 20 + minimum-round-time: 4 + round-time-reduction: 1 + +default-floor-materials: + - RED_CONCRETE + - ORANGE_CONCRETE + - YELLOW_CONCRETE + - LIME_CONCRETE + - GREEN_CONCRETE + - CYAN_CONCRETE + - LIGHT_BLUE_CONCRETE + - BLUE_CONCRETE + - PURPLE_CONCRETE + - MAGENTA_CONCRETE + - PINK_CONCRETE + - WHITE_CONCRETE + - BLACK_CONCRETE + - GRAY_CONCRETE + - LIGHT_GRAY_CONCRETE + - BROWN_CONCRETE + +rewards: + winner: + commands: + - "eco give %player% 100" + - "say %player% won BlockParty in %arena% after %round% rounds!" + +integrations: + placeholderapi: true diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml new file mode 100644 index 0000000..4b0cf3a --- /dev/null +++ b/src/main/resources/messages.yml @@ -0,0 +1,56 @@ +# BlockParty messages - MiniMessage format supported (https://docs.advntr.dev/minimessage/format.html) + +errors: + no-permission: "You do not have permission to do that." + unknown-arena: "Unknown arena: %arena%" + already-in-arena: "You are already in an arena. Use /blockparty leave first." + not-in-arena: "You are not currently in an arena." + arena-disabled: "Arena '%arena%' is disabled." + arena-full: "Arena '%arena%' is full." + no-region: "Arena '%arena%' has no floor region set (use pos1/pos2)." + no-materials: "Arena '%arena%' has no floor materials configured." + +admin: + arena-exists: "Arena '%arena%' already exists." + arena-created: "Arena '%arena%' created." + arena-deleted: "Arena '%arena%' deleted." + arena-enabled: "Arena '%arena%' enabled." + arena-disabled: "Arena '%arena%' disabled." + validation-failed: "Arena '%arena%' failed validation:" + lobby-set: "Lobby set for '%arena%'." + spawn-set: "Spawn set for '%arena%'." + spectator-set: "Spectator location set for '%arena%'." + pos1-set: "Position 1 set for '%arena%'." + pos2-set: "Position 2 set for '%arena%'." + floor-set: "Floor palette for '%arena%' set to %count% material(s)." + floor-generated: "Floor generated for '%arena%'." + reloaded: "BlockParty configuration reloaded." + +player: + joined: "You joined arena '%arena%'." + left: "You left the arena." + +countdown: + actionbar: "Starting in %time%s..." + title: "%time%" + cancelled: "Not enough players - countdown cancelled." + +round: + title: "Round %round%" + subtitle: "Stand on %color%!" + actionbar: "Target: %color% - %time%s" + +game: + eliminated: "You were eliminated in round %round% of '%arena%'." + win-title: "%player% wins!" + no-winner: "The match ended with no winner." + +scoreboard: + title: "BlockParty" + lines: + - "&7Arena: &f%arena%" + - "&7Round: &f%round%" + - "" + - "&7Players: &f%players%" + - "&7Target: &f%target%" + - "&7Time: &f%time%s" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..f419762 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,44 @@ +name: BlockParty +version: '${version}' +main: us.tss3.blockparty.BlockPartyPlugin +api-version: '1.21' +author: tss3 +description: Colored-floor elimination minigame. +softdepend: [PlaceholderAPI, Vault] + +commands: + blockparty: + description: BlockParty main command + aliases: [bp] + usage: / help + +permissions: + blockparty.play: + description: Allows playing BlockParty (join/leave/stats) + default: true + blockparty.join: + description: Allows joining arenas + default: true + blockparty.spectate: + description: Allows spectating arenas + default: true + blockparty.admin: + description: Grants all BlockParty admin permissions + default: op + children: + blockparty.admin.create: true + blockparty.admin.delete: true + blockparty.admin.setup: true + blockparty.admin.reload: true + blockparty.admin.create: + description: Allows creating arenas + default: op + blockparty.admin.delete: + description: Allows deleting arenas + default: op + blockparty.admin.setup: + description: Allows configuring arenas (lobby/spawn/floor/etc) + default: op + blockparty.admin.reload: + description: Allows reloading the plugin + default: op diff --git a/src/test/java/us/tss3/blockparty/logic/ArenaConfigValidatorTest.java b/src/test/java/us/tss3/blockparty/logic/ArenaConfigValidatorTest.java new file mode 100644 index 0000000..cf078a5 --- /dev/null +++ b/src/test/java/us/tss3/blockparty/logic/ArenaConfigValidatorTest.java @@ -0,0 +1,74 @@ +package us.tss3.blockparty.logic; + +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +class ArenaConfigValidatorTest { + + private ArenaConfigValidator.Fields validFields() { + return new ArenaConfigValidator.Fields( + "arena1", "world", true, true, true, true, + 2, 16, 10, 5, 1, 3, 20, 3, 1, 5, + List.of("RED_CONCRETE", "BLUE_CONCRETE") + ); + } + + @Test + void validFieldsProduceNoErrors() { + assertTrue(ArenaConfigValidator.validate(validFields()).isEmpty()); + } + + @Test + void missingLobbyDetected() { + ArenaConfigValidator.Fields f = new ArenaConfigValidator.Fields( + "arena1", "world", false, true, true, true, + 2, 16, 10, 5, 1, 3, 20, 3, 1, 5, + List.of("RED_CONCRETE")); + List errors = ArenaConfigValidator.validate(f); + assertTrue(errors.stream().anyMatch(e -> e.contains("lobby"))); + } + + @Test + void emptyPaletteDetected() { + ArenaConfigValidator.Fields f = new ArenaConfigValidator.Fields( + "arena1", "world", true, true, true, true, + 2, 16, 10, 5, 1, 3, 20, 3, 1, 5, + List.of()); + List errors = ArenaConfigValidator.validate(f); + assertTrue(errors.stream().anyMatch(e -> e.contains("floor-materials"))); + } + + @Test + void maxLessThanMinDetected() { + ArenaConfigValidator.Fields f = new ArenaConfigValidator.Fields( + "arena1", "world", true, true, true, true, + 10, 5, 10, 5, 1, 3, 20, 3, 1, 5, + List.of("RED_CONCRETE")); + List errors = ArenaConfigValidator.validate(f); + assertTrue(errors.stream().anyMatch(e -> e.contains("max-players"))); + } + + @Test + void minimumRoundTimeAboveStartingDetected() { + ArenaConfigValidator.Fields f = new ArenaConfigValidator.Fields( + "arena1", "world", true, true, true, true, + 2, 16, 10, 5, 1, 3, 5, 20, 1, 5, + List.of("RED_CONCRETE")); + List errors = ArenaConfigValidator.validate(f); + assertTrue(errors.stream().anyMatch(e -> e.contains("minimum-round-time"))); + } + + @Test + void missingNameAndWorldDetected() { + ArenaConfigValidator.Fields f = new ArenaConfigValidator.Fields( + "", "", true, true, true, true, + 2, 16, 10, 5, 1, 3, 20, 3, 1, 5, + List.of("RED_CONCRETE")); + List errors = ArenaConfigValidator.validate(f); + assertTrue(errors.stream().anyMatch(e -> e.contains("name"))); + assertTrue(errors.stream().anyMatch(e -> e.contains("world"))); + } +} diff --git a/src/test/java/us/tss3/blockparty/logic/ArenaStateMachineTest.java b/src/test/java/us/tss3/blockparty/logic/ArenaStateMachineTest.java new file mode 100644 index 0000000..baea68c --- /dev/null +++ b/src/test/java/us/tss3/blockparty/logic/ArenaStateMachineTest.java @@ -0,0 +1,49 @@ +package us.tss3.blockparty.logic; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class ArenaStateMachineTest { + + @Test + void disabledTransitionsToWaiting() { + ArenaStateMachine sm = new ArenaStateMachine(ArenaPhase.DISABLED); + assertTrue(sm.transition(ArenaPhase.WAITING)); + assertEquals(ArenaPhase.WAITING, sm.getState()); + } + + @Test + void cannotSkipToRunningFromWaiting() { + ArenaStateMachine sm = new ArenaStateMachine(ArenaPhase.WAITING); + assertFalse(sm.canTransition(ArenaPhase.RUNNING)); + assertFalse(sm.transition(ArenaPhase.RUNNING)); + assertEquals(ArenaPhase.WAITING, sm.getState()); + } + + @Test + void fullHappyPathCycle() { + ArenaStateMachine sm = new ArenaStateMachine(ArenaPhase.DISABLED); + assertTrue(sm.transition(ArenaPhase.WAITING)); + assertTrue(sm.transition(ArenaPhase.STARTING)); + assertTrue(sm.transition(ArenaPhase.RUNNING)); + assertTrue(sm.transition(ArenaPhase.ENDING)); + assertTrue(sm.transition(ArenaPhase.WAITING)); + } + + @Test + void anyStateCanDisable() { + for (ArenaPhase phase : ArenaPhase.values()) { + ArenaStateMachine sm = new ArenaStateMachine(phase); + if (phase != ArenaPhase.DISABLED) { + assertTrue(sm.canTransition(ArenaPhase.DISABLED), "expected " + phase + " -> DISABLED"); + } + } + } + + @Test + void startingCanRevertToWaiting() { + ArenaStateMachine sm = new ArenaStateMachine(ArenaPhase.STARTING); + assertTrue(sm.transition(ArenaPhase.WAITING)); + } +} diff --git a/src/test/java/us/tss3/blockparty/logic/CountdownLogicTest.java b/src/test/java/us/tss3/blockparty/logic/CountdownLogicTest.java new file mode 100644 index 0000000..00e8ef4 --- /dev/null +++ b/src/test/java/us/tss3/blockparty/logic/CountdownLogicTest.java @@ -0,0 +1,46 @@ +package us.tss3.blockparty.logic; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class CountdownLogicTest { + + @Test + void startsWhenMinReached() { + assertTrue(CountdownLogic.shouldStart(3, 3, false)); + assertTrue(CountdownLogic.shouldStart(5, 3, false)); + } + + @Test + void doesNotStartBelowMin() { + assertFalse(CountdownLogic.shouldStart(2, 3, false)); + } + + @Test + void doesNotRestartIfAlreadyCounting() { + assertFalse(CountdownLogic.shouldStart(5, 3, true)); + } + + @Test + void cancelsWhenBelowMinDuringCountdown() { + assertTrue(CountdownLogic.shouldCancel(2, 3, true)); + } + + @Test + void doesNotCancelWhenNotCounting() { + assertFalse(CountdownLogic.shouldCancel(2, 3, false)); + } + + @Test + void tickClampsAtZero() { + assertEquals(0, CountdownLogic.tick(0)); + assertEquals(4, CountdownLogic.tick(5)); + } + + @Test + void isFinishedAtZeroOrBelow() { + assertTrue(CountdownLogic.isFinished(0)); + assertFalse(CountdownLogic.isFinished(1)); + } +} diff --git a/src/test/java/us/tss3/blockparty/logic/EliminationLogicTest.java b/src/test/java/us/tss3/blockparty/logic/EliminationLogicTest.java new file mode 100644 index 0000000..a9736c4 --- /dev/null +++ b/src/test/java/us/tss3/blockparty/logic/EliminationLogicTest.java @@ -0,0 +1,49 @@ +package us.tss3.blockparty.logic; + +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; + +class EliminationLogicTest { + + @Test + void eliminatesWrongMaterial() { + List> states = List.of( + new EliminationLogic.PlayerFloorState<>("p1", "RED"), + new EliminationLogic.PlayerFloorState<>("p2", "BLUE"), + new EliminationLogic.PlayerFloorState<>("p3", "RED") + ); + List eliminated = EliminationLogic.determineEliminated(states, "RED"); + assertEquals(List.of("p2"), eliminated); + } + + @Test + void eliminatesPlayersStandingOnNothing() { + List> states = List.of( + new EliminationLogic.PlayerFloorState<>("p1", null) + ); + assertEquals(List.of("p1"), EliminationLogic.determineEliminated(states, "RED")); + } + + @Test + void winnerDeterminedWithOnePlayerLeft() { + Optional winner = EliminationLogic.determineWinner(List.of("p1")); + assertTrue(winner.isPresent()); + assertEquals("p1", winner.get()); + } + + @Test + void noWinnerWithMultiplePlayers() { + assertTrue(EliminationLogic.determineWinner(List.of("p1", "p2")).isEmpty()); + } + + @Test + void matchOverAtOneOrZero() { + assertTrue(EliminationLogic.isMatchOver(1)); + assertTrue(EliminationLogic.isMatchOver(0)); + assertFalse(EliminationLogic.isMatchOver(2)); + } +} diff --git a/src/test/java/us/tss3/blockparty/logic/PlayerCountLogicTest.java b/src/test/java/us/tss3/blockparty/logic/PlayerCountLogicTest.java new file mode 100644 index 0000000..9ab9a18 --- /dev/null +++ b/src/test/java/us/tss3/blockparty/logic/PlayerCountLogicTest.java @@ -0,0 +1,45 @@ +package us.tss3.blockparty.logic; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class PlayerCountLogicTest { + + @Test + void canJoinWhenWaitingAndRoom() { + assertTrue(PlayerCountLogic.canJoin(2, 10, true, false, true, ArenaPhase.WAITING)); + } + + @Test + void cannotJoinWhenFull() { + assertFalse(PlayerCountLogic.canJoin(10, 10, true, false, true, ArenaPhase.WAITING)); + } + + @Test + void cannotJoinWhenDisabled() { + assertFalse(PlayerCountLogic.canJoin(2, 10, false, false, true, ArenaPhase.WAITING)); + } + + @Test + void cannotJoinWhenAlreadyInAnotherArena() { + assertFalse(PlayerCountLogic.canJoin(2, 10, true, true, true, ArenaPhase.WAITING)); + } + + @Test + void cannotJoinWhenRunning() { + assertFalse(PlayerCountLogic.canJoin(2, 10, true, false, true, ArenaPhase.RUNNING)); + } + + @Test + void startingRespectsAllowJoinFlag() { + assertFalse(PlayerCountLogic.canJoin(2, 10, true, false, false, ArenaPhase.STARTING)); + assertTrue(PlayerCountLogic.canJoin(2, 10, true, false, true, ArenaPhase.STARTING)); + } + + @Test + void autoStartAloneOnlyWhenMinIsOne() { + assertTrue(PlayerCountLogic.autoStartsAlone(1)); + assertFalse(PlayerCountLogic.autoStartsAlone(2)); + } +} diff --git a/src/test/java/us/tss3/blockparty/logic/RoundTimeCalculatorTest.java b/src/test/java/us/tss3/blockparty/logic/RoundTimeCalculatorTest.java new file mode 100644 index 0000000..7610646 --- /dev/null +++ b/src/test/java/us/tss3/blockparty/logic/RoundTimeCalculatorTest.java @@ -0,0 +1,34 @@ +package us.tss3.blockparty.logic; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class RoundTimeCalculatorTest { + + @Test + void firstRoundUsesStartingTime() { + assertEquals(20, RoundTimeCalculator.timeForRound(20, 5, 2, 1)); + } + + @Test + void reducesEachRound() { + assertEquals(18, RoundTimeCalculator.timeForRound(20, 5, 2, 2)); + assertEquals(16, RoundTimeCalculator.timeForRound(20, 5, 2, 3)); + } + + @Test + void clampsAtMinimum() { + assertEquals(5, RoundTimeCalculator.timeForRound(20, 5, 2, 20)); + } + + @Test + void neverNegativeEvenWithoutMinimum() { + assertEquals(0, RoundTimeCalculator.timeForRound(5, 0, 100, 3)); + } + + @Test + void roundNumberBelowOneTreatedAsOne() { + assertEquals(20, RoundTimeCalculator.timeForRound(20, 5, 2, 0)); + } +} diff --git a/src/test/java/us/tss3/blockparty/logic/TargetColorSelectorTest.java b/src/test/java/us/tss3/blockparty/logic/TargetColorSelectorTest.java new file mode 100644 index 0000000..7a72526 --- /dev/null +++ b/src/test/java/us/tss3/blockparty/logic/TargetColorSelectorTest.java @@ -0,0 +1,45 @@ +package us.tss3.blockparty.logic; + +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +class TargetColorSelectorTest { + + @Test + void deterministicWithFixedRng() { + TargetColorSelector selector = new TargetColorSelector(bound -> 2); + String result = selector.select(List.of("RED", "GREEN", "BLUE", "YELLOW")); + assertEquals("BLUE", result); + } + + @Test + void emptyPaletteThrows() { + TargetColorSelector selector = new TargetColorSelector(bound -> 0); + assertThrows(IllegalArgumentException.class, () -> selector.select(List.of())); + } + + @Test + void selectExcludingAvoidsRepeatWhenPossible() { + int[] calls = {0}; + int[] sequence = {0, 0, 1}; // first two picks are index 0 (== previous), third differs + TargetColorSelector selector = new TargetColorSelector(bound -> sequence[Math.min(calls[0]++, sequence.length - 1)]); + List palette = List.of("RED", "GREEN"); + String result = selector.selectExcluding(palette, "RED"); + assertEquals("GREEN", result); + } + + @Test + void selectExcludingSinglePaletteReturnsSameValue() { + TargetColorSelector selector = new TargetColorSelector(bound -> 0); + assertEquals("RED", selector.selectExcluding(List.of("RED"), "RED")); + } + + @Test + void outOfRangeIndexFallsBackToZero() { + TargetColorSelector selector = new TargetColorSelector(bound -> 99); + assertEquals("RED", selector.select(List.of("RED", "GREEN"))); + } +}