From c87d923cad0944964c5829ef410c0563a1f579c6 Mon Sep 17 00:00:00 2001 From: Dylan Garvis Date: Sun, 9 Aug 2026 15:01:44 -0400 Subject: [PATCH] feat(base): implement progression system --- .gitea/workflows/ci.yml | 40 +++ .gitea/workflows/release.yml | 141 ++++++++ .gitignore | 7 + README.md | 54 +++ build.gradle.kts | 46 +++ design/index.md | 15 + design/log.md | 29 ++ design/user-stories/index.md | 20 ++ .../us-001-unlock-and-establish-base.md | 32 ++ .../us-002-unlock-base-navigation.md | 26 ++ design/user-stories/us-003-expand-the-base.md | 29 ++ .../us-004-unlock-and-control-base-flight.md | 35 ++ .../us-005-unlock-base-teleportation.md | 32 ++ .../us-006-reduce-teleport-warmup.md | 28 ++ .../us-007-reduce-teleport-cooldown.md | 29 ++ .../us-008-unlock-visitor-access.md | 36 ++ ...-009-view-progression-and-notifications.md | 30 ++ .../us-010-administer-player-progression.md | 31 ++ ...s-011-configure-and-persist-progression.md | 30 ++ .../us-012-build-and-release-plugin.md | 27 ++ gradle/gradlew | 248 ++++++++++++++ gradle/gradlew.bat | 82 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 48462 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++ gradlew.bat | 82 +++++ settings.gradle.kts | 1 + .../spigotbase/AdminProgressionService.java | 83 +++++ .../dmg/spigotbase/BaseAdminCommand.java | 172 ++++++++++ .../java/games/dmg/spigotbase/BaseArea.java | 27 ++ .../dmg/spigotbase/BaseBoundsService.java | 35 ++ .../games/dmg/spigotbase/BaseCommand.java | 123 +++++++ .../dmg/spigotbase/BaseFlightCommand.java | 43 +++ .../dmg/spigotbase/BaseFlightController.java | 156 +++++++++ .../games/dmg/spigotbase/BaseLocation.java | 25 ++ .../dmg/spigotbase/BaseNavigationCommand.java | 47 +++ .../spigotbase/BaseNavigationController.java | 45 +++ .../dmg/spigotbase/BaseProgressCommand.java | 121 +++++++ .../dmg/spigotbase/BaseProgressListener.java | 310 ++++++++++++++++++ .../spigotbase/BaseProgressionService.java | 29 ++ .../games/dmg/spigotbase/BaseService.java | 39 +++ .../dmg/spigotbase/BaseStateManager.java | 96 ++++++ .../dmg/spigotbase/BaseTeleportManager.java | 298 +++++++++++++++++ .../dmg/spigotbase/BaseVisitorsCommand.java | 38 +++ .../dmg/spigotbase/DurationFormatter.java | 22 ++ .../games/dmg/spigotbase/GoToBaseCommand.java | 61 ++++ .../games/dmg/spigotbase/PersistentState.java | 14 + .../games/dmg/spigotbase/PlayerState.java | 278 ++++++++++++++++ .../games/dmg/spigotbase/PluginSettings.java | 210 ++++++++++++ .../games/dmg/spigotbase/ProgressionPath.java | 9 + .../dmg/spigotbase/ProgressionUpdate.java | 20 ++ .../dmg/spigotbase/SafeBaseDestination.java | 78 +++++ .../SecondaryProgressionService.java | 67 ++++ .../games/dmg/spigotbase/SetBaseCommand.java | 61 ++++ .../dmg/spigotbase/SpigotBasePlugin.java | 114 +++++++ .../games/dmg/spigotbase/TeleportPolicy.java | 45 +++ .../TeleportProgressionService.java | 90 +++++ .../games/dmg/spigotbase/VisitorPolicy.java | 20 ++ .../spigotbase/YamlBaseStateRepository.java | 218 ++++++++++++ src/main/resources/config.yml | 40 +++ src/main/resources/plugin.yml | 36 ++ .../AdminProgressionServiceTest.java | 48 +++ .../games/dmg/spigotbase/BaseAreaTest.java | 25 ++ .../dmg/spigotbase/BaseBoundsServiceTest.java | 33 ++ .../BaseNavigationProgressionTest.java | 24 ++ .../BaseProgressionServiceTest.java | 38 +++ .../games/dmg/spigotbase/BaseServiceTest.java | 51 +++ .../dmg/spigotbase/BaseStateManagerTest.java | 32 ++ .../games/dmg/spigotbase/PlayerStateTest.java | 32 ++ .../dmg/spigotbase/PluginMetadataTest.java | 33 ++ .../dmg/spigotbase/PluginSettingsTest.java | 42 +++ .../SecondaryProgressionServiceTest.java | 61 ++++ .../dmg/spigotbase/TeleportPolicyTest.java | 52 +++ .../TeleportProgressionServiceTest.java | 56 ++++ .../dmg/spigotbase/VisitorPolicyTest.java | 44 +++ .../YamlBaseStateRepositoryTest.java | 66 ++++ 76 files changed, 5092 insertions(+) create mode 100644 .gitea/workflows/ci.yml create mode 100644 .gitea/workflows/release.yml create mode 100644 .gitignore create mode 100644 README.md create mode 100644 build.gradle.kts create mode 100644 design/index.md create mode 100644 design/log.md create mode 100644 design/user-stories/index.md create mode 100644 design/user-stories/us-001-unlock-and-establish-base.md create mode 100644 design/user-stories/us-002-unlock-base-navigation.md create mode 100644 design/user-stories/us-003-expand-the-base.md create mode 100644 design/user-stories/us-004-unlock-and-control-base-flight.md create mode 100644 design/user-stories/us-005-unlock-base-teleportation.md create mode 100644 design/user-stories/us-006-reduce-teleport-warmup.md create mode 100644 design/user-stories/us-007-reduce-teleport-cooldown.md create mode 100644 design/user-stories/us-008-unlock-visitor-access.md create mode 100644 design/user-stories/us-009-view-progression-and-notifications.md create mode 100644 design/user-stories/us-010-administer-player-progression.md create mode 100644 design/user-stories/us-011-configure-and-persist-progression.md create mode 100644 design/user-stories/us-012-build-and-release-plugin.md create mode 100755 gradle/gradlew create mode 100644 gradle/gradlew.bat create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/java/games/dmg/spigotbase/AdminProgressionService.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseAdminCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseArea.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseBoundsService.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseFlightCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseFlightController.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseLocation.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseNavigationCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseNavigationController.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseProgressCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseProgressListener.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseProgressionService.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseService.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseStateManager.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseTeleportManager.java create mode 100644 src/main/java/games/dmg/spigotbase/BaseVisitorsCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/DurationFormatter.java create mode 100644 src/main/java/games/dmg/spigotbase/GoToBaseCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/PersistentState.java create mode 100644 src/main/java/games/dmg/spigotbase/PlayerState.java create mode 100644 src/main/java/games/dmg/spigotbase/PluginSettings.java create mode 100644 src/main/java/games/dmg/spigotbase/ProgressionPath.java create mode 100644 src/main/java/games/dmg/spigotbase/ProgressionUpdate.java create mode 100644 src/main/java/games/dmg/spigotbase/SafeBaseDestination.java create mode 100644 src/main/java/games/dmg/spigotbase/SecondaryProgressionService.java create mode 100644 src/main/java/games/dmg/spigotbase/SetBaseCommand.java create mode 100644 src/main/java/games/dmg/spigotbase/SpigotBasePlugin.java create mode 100644 src/main/java/games/dmg/spigotbase/TeleportPolicy.java create mode 100644 src/main/java/games/dmg/spigotbase/TeleportProgressionService.java create mode 100644 src/main/java/games/dmg/spigotbase/VisitorPolicy.java create mode 100644 src/main/java/games/dmg/spigotbase/YamlBaseStateRepository.java create mode 100644 src/main/resources/config.yml create mode 100644 src/main/resources/plugin.yml create mode 100644 src/test/java/games/dmg/spigotbase/AdminProgressionServiceTest.java create mode 100644 src/test/java/games/dmg/spigotbase/BaseAreaTest.java create mode 100644 src/test/java/games/dmg/spigotbase/BaseBoundsServiceTest.java create mode 100644 src/test/java/games/dmg/spigotbase/BaseNavigationProgressionTest.java create mode 100644 src/test/java/games/dmg/spigotbase/BaseProgressionServiceTest.java create mode 100644 src/test/java/games/dmg/spigotbase/BaseServiceTest.java create mode 100644 src/test/java/games/dmg/spigotbase/BaseStateManagerTest.java create mode 100644 src/test/java/games/dmg/spigotbase/PlayerStateTest.java create mode 100644 src/test/java/games/dmg/spigotbase/PluginMetadataTest.java create mode 100644 src/test/java/games/dmg/spigotbase/PluginSettingsTest.java create mode 100644 src/test/java/games/dmg/spigotbase/SecondaryProgressionServiceTest.java create mode 100644 src/test/java/games/dmg/spigotbase/TeleportPolicyTest.java create mode 100644 src/test/java/games/dmg/spigotbase/TeleportProgressionServiceTest.java create mode 100644 src/test/java/games/dmg/spigotbase/VisitorPolicyTest.java create mode 100644 src/test/java/games/dmg/spigotbase/YamlBaseStateRepositoryTest.java diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml new file mode 100644 index 0000000..325df2e --- /dev/null +++ b/.gitea/workflows/ci.yml @@ -0,0 +1,40 @@ +name: CI + +on: + push: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + cache: gradle + + - name: Validate conventional commits + if: github.event_name == 'pull_request' + run: | + npx -y \ + -p @commitlint/cli \ + -p @commitlint/config-conventional \ + commitlint --from "${{ github.event.pull_request.base.sha }}" --to "${{ github.sha }}" \ + --extends @commitlint/config-conventional + + - name: Build and test + run: ./gradlew clean check jar + + - name: Upload development artifact + uses: actions/upload-artifact@v3 + with: + name: spigot-base-${{ github.sha }} + path: build/libs/*.jar + if-no-files-found: error diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml new file mode 100644 index 0000000..a0dc591 --- /dev/null +++ b/.gitea/workflows/release.yml @@ -0,0 +1,141 @@ +name: Release + +on: + push: + branches: + - main + +jobs: + release: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.RELEASE_TOKEN }} + + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + cache: gradle + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Build and test before release + run: ./gradlew clean check + + - name: Capture previous tag + id: previous_tag + run: | + if git describe --tags --abbrev=0 >/dev/null 2>&1; then + echo "value=$(git describe --tags --abbrev=0)" >> "$GITHUB_OUTPUT" + else + echo "value=" >> "$GITHUB_OUTPUT" + fi + + - name: Run semantic-release + env: + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + run: | + npx -y \ + -p semantic-release@24.2.9 \ + -p @semantic-release/commit-analyzer@13.0.1 \ + -p @semantic-release/release-notes-generator@14.1.0 \ + semantic-release \ + --branches main \ + --plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator + + - name: Capture current tag + id: current_tag + run: | + if git describe --tags --exact-match HEAD >/dev/null 2>&1; then + echo "value=$(git describe --tags --exact-match HEAD)" >> "$GITHUB_OUTPUT" + else + echo "value=" >> "$GITHUB_OUTPUT" + fi + + - name: Resolve release + id: release + env: + PREVIOUS_TAG: ${{ steps.previous_tag.outputs.value }} + CURRENT_TAG: ${{ steps.current_tag.outputs.value }} + run: | + if [ -n "$CURRENT_TAG" ] && [ "$CURRENT_TAG" != "$PREVIOUS_TAG" ]; then + echo "created=true" >> "$GITHUB_OUTPUT" + echo "tag=$CURRENT_TAG" >> "$GITHUB_OUTPUT" + echo "version=${CURRENT_TAG#v}" >> "$GITHUB_OUTPUT" + else + echo "created=false" >> "$GITHUB_OUTPUT" + fi + + - name: Build versioned plugin + if: steps.release.outputs.created == 'true' + env: + VERSION: ${{ steps.release.outputs.version }} + run: ./gradlew clean jar -PreleaseVersion="$VERSION" + + - name: Upload release workflow artifact + if: steps.release.outputs.created == 'true' + uses: actions/upload-artifact@v3 + with: + name: spigot-base-${{ steps.release.outputs.version }} + path: build/libs/spigot-base-${{ steps.release.outputs.version }}.jar + if-no-files-found: error + + - name: Create Gitea release and upload plugin + if: steps.release.outputs.created == 'true' + env: + GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }} + GITEA_SERVER_URL: ${{ github.server_url }} + REPOSITORY: ${{ github.repository }} + TAG: ${{ steps.release.outputs.tag }} + VERSION: ${{ steps.release.outputs.version }} + PREVIOUS_TAG: ${{ steps.previous_tag.outputs.value }} + run: | + api_url="${GITEA_SERVER_URL}/api/v1" + jar="build/libs/spigot-base-${VERSION}.jar" + export RELEASE_BODY + if [ -n "$PREVIOUS_TAG" ]; then + RELEASE_BODY=$(git log --pretty='format:- %s (%h)' "${PREVIOUS_TAG}..HEAD") + else + RELEASE_BODY=$(git log --pretty='format:- %s (%h)' HEAD) + fi + payload=$(node -e ' + const payload = { + tag_name: process.env.TAG, + name: process.env.TAG, + body: process.env.RELEASE_BODY, + draft: false, + prerelease: false + }; + process.stdout.write(JSON.stringify(payload)); + ') + response=$(curl --fail-with-body --silent --show-error \ + -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -H "Content-Type: application/json" \ + "${api_url}/repos/${REPOSITORY}/releases" \ + --data "$payload") + release_id=$(printf '%s' "$response" | node -e ' + let input = ""; + process.stdin.on("data", chunk => input += chunk); + process.stdin.on("end", () => { + const response = JSON.parse(input); + if (!response.id) process.exit(1); + process.stdout.write(String(response.id)); + }); + ') + curl --fail-with-body --silent --show-error \ + -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -H "Content-Type: application/octet-stream" \ + --data-binary "@${jar}" \ + "${api_url}/repos/${REPOSITORY}/releases/${release_id}/assets?name=spigot-base-${VERSION}.jar" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3f37d6c --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.gradle/ +build/ +out/ +.idea/ +*.iml +*.log +.DS_Store diff --git a/README.md b/README.md new file mode 100644 index 0000000..347db1f --- /dev/null +++ b/README.md @@ -0,0 +1,54 @@ +# Spigot Base + +A Spigot 26.2 plugin providing progression-gated player bases and quality-of-life unlocks. + +Players begin by breaking Survival-mode grass blocks or dirt. The progression paths provide a persistent base, navigation particles, expanding base bounds, controlled flight, personal teleportation, and visitor teleportation. + +The approved behavior is specified in the [OKF design bundle](design/index.md). + +## Requirements + +- Spigot 26.2 +- Java 17 or newer + +## Build + +```bash +./gradlew clean check jar +``` + +The plugin JAR is written to `build/libs/`. + +## Player commands + +```text +/setbase +/base +/base upgrade +/basenavigation +/baseflight +/basevisitors +/gotobase +/baseprogress +/baseprogress bossbar +``` + +`/base` has a stationary warm-up. Looking around is allowed, while movement between blocks, damage, teleportation, world changes, death, logout, and conflicting teleport commands cancel it without consuming the cooldown. + +## Administration + +The `spigotbase.admin` permission is granted to server operators by default. + +```text +/baseadmin progress +/baseadmin setlevel +/baseadmin clearcooldown [personal|visitor|all] +/baseadmin reset +/baseadmin reset all confirm +``` + +Default thresholds and durations are documented in `src/main/resources/config.yml`. Durable UUID-keyed state is stored in `plugins/SpigotBase/state.yml` using atomic replacement where supported. + +## Releases + +Gitea Actions checks pushes and pull requests and stores a development JAR. Pull requests validate conventional commits. Main-branch conventional commits drive semantic releases when the repository defines a `RELEASE_TOKEN` with contents-write permission. diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..97df943 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,46 @@ +plugins { + java +} + +group = "games.dmg" +version = providers.gradleProperty("releaseVersion") + .orElse("0.1.0-SNAPSHOT") + .get() + +repositories { + mavenCentral() + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +tasks.withType().configureEach { + options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror")) +} + +dependencies { + compileOnly("org.spigotmc:spigot-api:26.2-R0.1-SNAPSHOT") + + testImplementation("org.spigotmc:spigot-api:26.2-R0.1-SNAPSHOT") + testImplementation(platform("org.junit:junit-bom:5.13.4")) + testImplementation("org.junit.jupiter:junit-jupiter") + testImplementation("org.mockito:mockito-core:5.18.0") + testImplementation("org.yaml:snakeyaml:2.4") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} + +tasks.test { + useJUnitPlatform() +} + +val pluginVersion = version + +tasks.processResources { + filesMatching("plugin.yml") { + expand("version" to pluginVersion) + } +} diff --git a/design/index.md b/design/index.md new file mode 100644 index 0000000..759fbec --- /dev/null +++ b/design/index.md @@ -0,0 +1,15 @@ +--- +type: Index +title: Spigot Base Design +description: Entry point for the Spigot Base OKF knowledge bundle. +okf_version: "0.1" +--- + +# Spigot Base Design + +This bundle documents the progression-gated quality-of-life features, player bases, flight, teleportation, administration, persistence, and delivery requirements for the Spigot Base plugin. + +## Explore + +- [User stories](user-stories/index.md) +- [Design log](log.md) diff --git a/design/log.md b/design/log.md new file mode 100644 index 0000000..33e10e4 --- /dev/null +++ b/design/log.md @@ -0,0 +1,29 @@ +--- +type: Log +title: Spigot Base Design Log +description: Chronological record of material decisions affecting the Spigot Base design. +--- + +# Spigot Base Design Log + +## 2026-08-09 — Initial progression design + +- Base progression is sequential: Base I establishes a base, Base II provides navigation, Base III provides personal teleportation, and Base IV permits visitor teleportation. +- Every secondary progression path requires Base I. +- A base is cylindrical and begins with a 10-block radius and a vertical extent 25 blocks above and below its set Y coordinate. +- Only Survival-mode activity contributes progress; repeatedly placing and breaking blocks is permitted. +- Flight is limited to the base, includes a five-block horizontal warning buffer, and can be toggled by the player. +- Player-facing administration will initially use commands rather than an inventory UI. +- The build and release pipeline will follow the neighboring Trigger Spawn project pattern. + +## 2026-08-09 — Implementation started + +- Approved implementation begins with the tested Gradle/Spigot foundation, validated configuration, and durable player state. +- Feature work will proceed incrementally using tests before implementation where practical. + +## 2026-08-09 — Core implementation checkpoint + +- Implemented UUID-keyed YAML state, validated configuration, Base I–IV progression, base sizing, particle navigation, controlled base flight, personal and visitor teleportation, progress feedback, and initial administrative commands. +- Added Gradle, Spigot metadata, Gitea CI/release workflows, and project documentation based on Trigger Spawn. +- Verified the implementation with `./gradlew clean check jar`: 34 tests passed and the plugin JAR was produced successfully. +- User stories remain in progress pending live-server integration verification and completion of runtime administrative configuration editing. diff --git a/design/user-stories/index.md b/design/user-stories/index.md new file mode 100644 index 0000000..779a099 --- /dev/null +++ b/design/user-stories/index.md @@ -0,0 +1,20 @@ +--- +type: Index +title: Spigot Base User Stories +description: Catalog of user stories for the Spigot Base plugin. +--- + +# Spigot Base User Stories + +1. [US-001: Unlock and establish Base I](us-001-unlock-and-establish-base.md) +2. [US-002: Unlock Base II navigation](us-002-unlock-base-navigation.md) +3. [US-003: Expand the base](us-003-expand-the-base.md) +4. [US-004: Unlock and control base flight](us-004-unlock-and-control-base-flight.md) +5. [US-005: Unlock Base III teleportation](us-005-unlock-base-teleportation.md) +6. [US-006: Reduce the base teleport warm-up](us-006-reduce-teleport-warmup.md) +7. [US-007: Reduce the base teleport cooldown](us-007-reduce-teleport-cooldown.md) +8. [US-008: Unlock Base IV visitor access](us-008-unlock-visitor-access.md) +9. [US-009: View progression and unlock notifications](us-009-view-progression-and-notifications.md) +10. [US-010: Administer player progression](us-010-administer-player-progression.md) +11. [US-011: Configure and persist progression](us-011-configure-and-persist-progression.md) +12. [US-012: Build and release the plugin](us-012-build-and-release-plugin.md) diff --git a/design/user-stories/us-001-unlock-and-establish-base.md b/design/user-stories/us-001-unlock-and-establish-base.md new file mode 100644 index 0000000..7b3b760 --- /dev/null +++ b/design/user-stories/us-001-unlock-and-establish-base.md @@ -0,0 +1,32 @@ +--- +type: User Story +title: "US-001: Unlock and establish Base I" +description: Let players earn and establish a persistent personal base by breaking dirt and grass blocks. +status: in-progress +--- + +# US-001: Unlock and establish Base I + +As a **player**, I want to earn and set a personal base so that later quality-of-life progression has a location associated with it. + +## Acceptance criteria + +- [ ] Only blocks broken while the player is in Survival mode contribute progression. +- [ ] Breaking `GRASS_BLOCK` or `DIRT` contributes one unit of Base I progress. +- [ ] Other dirt-like materials, including coarse dirt, rooted dirt, podzol, mycelium, and dirt paths, do not contribute by default. +- [ ] Player-placed blocks may contribute when broken; natural-generation detection is not required. +- [ ] Base I unlocks when the player reaches the configured threshold, which defaults to 250 qualifying blocks. +- [ ] `/setbase` is unavailable before Base I and explains the unmet requirement. +- [ ] After Base I unlocks, `/setbase` records the player's current world and block location as the center of a cylindrical base. +- [ ] The initial cylinder has a configurable 10-block horizontal radius and extends a configurable 25 blocks above and 25 blocks below the set Y coordinate. +- [ ] The first successful `/setbase` is immediately available. +- [ ] A successful relocation starts a configurable elapsed-time cooldown that defaults to 24 hours. +- [ ] Failed attempts do not start or extend the relocation cooldown. +- [ ] Progress and base state are associated with the player's UUID and survive restarts. + +## Related + +- [US-002: Unlock Base II navigation](us-002-unlock-base-navigation.md) +- [US-003: Expand the base](us-003-expand-the-base.md) +- [US-004: Unlock and control base flight](us-004-unlock-and-control-base-flight.md) +- [US-005: Unlock Base III teleportation](us-005-unlock-base-teleportation.md) diff --git a/design/user-stories/us-002-unlock-base-navigation.md b/design/user-stories/us-002-unlock-base-navigation.md new file mode 100644 index 0000000..4b7f963 --- /dev/null +++ b/design/user-stories/us-002-unlock-base-navigation.md @@ -0,0 +1,26 @@ +--- +type: User Story +title: "US-002: Unlock Base II navigation" +description: Let players earn toggleable particle guidance toward their established base. +status: in-progress +--- + +# US-002: Unlock Base II navigation + +As a **player with Base I**, I want visual guidance toward my base so that I can find it without relying on coordinates. + +## Acceptance criteria + +- [ ] Base II requires Base I and an established base. +- [ ] Base II unlocks at a configurable cumulative grass-or-dirt threshold that defaults to 500 blocks, 250 more than Base I. +- [ ] Base II provides particle-based navigation and does not grant or require a physical compass item. +- [ ] While enabled and in the base's world, particles are drawn along the ground to indicate the direction toward the base. +- [ ] Particle generation is bounded to avoid excessive server or client load. +- [ ] A player in another world receives a clear message instead of a misleading particle direction. +- [ ] `/basenavigation` toggles guidance on and off after Base II is unlocked. +- [ ] The navigation preference persists across reconnects and restarts. + +## Related + +- [US-001: Unlock and establish Base I](us-001-unlock-and-establish-base.md) +- [US-009: View progression and unlock notifications](us-009-view-progression-and-notifications.md) diff --git a/design/user-stories/us-003-expand-the-base.md b/design/user-stories/us-003-expand-the-base.md new file mode 100644 index 0000000..b958883 --- /dev/null +++ b/design/user-stories/us-003-expand-the-base.md @@ -0,0 +1,29 @@ +--- +type: User Story +title: "US-003: Expand the base" +description: Let players expand their base radius through sequential stone, deepslate, and obsidian mining milestones. +status: in-progress +--- + +# US-003: Expand the base + +As a **player with Base I**, I want mining milestones to expand my base so that more of my build receives base benefits. + +## Acceptance criteria + +- [ ] Base-size progression is unavailable until Base I is unlocked. +- [ ] Only qualifying blocks broken in Survival mode count. +- [ ] The first expansion requires a configurable 500 `STONE` and changes the radius from 10 to 25 blocks by default. +- [ ] After the stone tier, the second expansion requires a separate configurable 1,000 `DEEPSLATE` and changes the radius from 25 to 75 blocks by default. +- [ ] After the deepslate tier, the third expansion requires a separate configurable 1,000 `OBSIDIAN` and changes the radius from 75 to 150 blocks by default. +- [ ] Stone, deepslate, and obsidian variants do not count by default. +- [ ] Materials mined before their sequential tier becomes active do not count toward that later tier. +- [ ] Player-placed qualifying blocks may be mined repeatedly for progress. +- [ ] Expansions affect the cylinder's horizontal radius without independently changing its vertical bounds. +- [ ] Relocating the base preserves earned size tiers and counters. + +## Related + +- [US-001: Unlock and establish Base I](us-001-unlock-and-establish-base.md) +- [US-004: Unlock and control base flight](us-004-unlock-and-control-base-flight.md) +- [US-011: Configure and persist progression](us-011-configure-and-persist-progression.md) diff --git a/design/user-stories/us-004-unlock-and-control-base-flight.md b/design/user-stories/us-004-unlock-and-control-base-flight.md new file mode 100644 index 0000000..b1ce5a1 --- /dev/null +++ b/design/user-stories/us-004-unlock-and-control-base-flight.md @@ -0,0 +1,35 @@ +--- +type: User Story +title: "US-004: Unlock and control base flight" +description: Let players permanently unlock and toggle increasingly broad flight within their personal base. +status: in-progress +--- + +# US-004: Unlock and control base flight + +As a **player with Base I**, I want to unlock controlled flight around my base so that I can build large structures more conveniently. + +## Acceptance criteria + +- [ ] Flight progression is unavailable until Base I is unlocked and a base is established. +- [ ] The plugin observes elytra held directly in the player's inventory and armor equipment while the player is in Survival mode. +- [ ] Elytra inside shulker boxes, bundles, or other nested containers do not count. +- [ ] Observing one elytra permanently unlocks Flight I, two simultaneous elytra unlock Flight II, and three simultaneous elytra unlock Flight III. +- [ ] A player observed with enough elytra for a later tier receives all unmet preceding flight tiers. +- [ ] Elytra are not consumed, and losing them later does not revoke an earned tier. +- [ ] Flight I permits plugin-granted flight within the current horizontal base radius and from 25 blocks below through 25 blocks above base Y by default. +- [ ] Flight II expands the vertical range to 100 blocks below and above base Y by default. +- [ ] Flight III expands the vertical range to the world's minimum and maximum build heights. +- [ ] A configurable five-block horizontal warning buffer extends beyond the current base radius. +- [ ] Plugin-granted flight remains active in the warning buffer and displays prominent on-screen notice that the player is leaving the base. +- [ ] Passing beyond the warning buffer removes only flight granted by this plugin. +- [ ] Flight is not granted outside the unlocked vertical range. +- [ ] `/baseflight` toggles the player's unlocked base flight on and off. +- [ ] The flight toggle persists across reconnects and restarts. +- [ ] The plugin handles teleportation, world changes, game-mode changes, death, logout, and plugin shutdown without leaving unintended flight enabled. + +## Related + +- [US-001: Unlock and establish Base I](us-001-unlock-and-establish-base.md) +- [US-003: Expand the base](us-003-expand-the-base.md) +- [US-009: View progression and unlock notifications](us-009-view-progression-and-notifications.md) diff --git a/design/user-stories/us-005-unlock-base-teleportation.md b/design/user-stories/us-005-unlock-base-teleportation.md new file mode 100644 index 0000000..f244b7d --- /dev/null +++ b/design/user-stories/us-005-unlock-base-teleportation.md @@ -0,0 +1,32 @@ +--- +type: User Story +title: "US-005: Unlock Base III teleportation" +description: Let players earn a safe, stationary-warm-up teleport to their personal base. +status: in-progress +--- + +# US-005: Unlock Base III teleportation + +As a **player with Base II**, I want to earn `/base` so that I can return safely to my established base. + +## Acceptance criteria + +- [ ] Base III requires Base II, an established base, and a configurable 200 qualifying block placements inside the base. +- [ ] Only placements made in Survival mode and within the base's current horizontal and vertical bounds count. +- [ ] Player-placed blocks and replacement of previously broken blocks may contribute repeatedly. +- [ ] Base III unlocks `/base` with a configurable 30-second warm-up and three-hour cooldown by default. +- [ ] Looking around without changing block coordinates does not cancel the warm-up. +- [ ] Changing block X, Y, or Z, taking damage, teleporting, changing worlds, dying, disconnecting, or starting a conflicting teleport cancels the warm-up. +- [ ] Cancellation clearly informs the player and does not consume the cooldown. +- [ ] The destination is a safe standing location at or near the recorded base center. +- [ ] An unavailable or unsafe destination is reported clearly and does not consume the cooldown. +- [ ] Only a completed teleport starts the cooldown. +- [ ] Cooldowns use real elapsed time and continue while the player is offline. + +## Related + +- [US-001: Unlock and establish Base I](us-001-unlock-and-establish-base.md) +- [US-002: Unlock Base II navigation](us-002-unlock-base-navigation.md) +- [US-006: Reduce the base teleport warm-up](us-006-reduce-teleport-warmup.md) +- [US-007: Reduce the base teleport cooldown](us-007-reduce-teleport-cooldown.md) +- [US-008: Unlock Base IV visitor access](us-008-unlock-visitor-access.md) diff --git a/design/user-stories/us-006-reduce-teleport-warmup.md b/design/user-stories/us-006-reduce-teleport-warmup.md new file mode 100644 index 0000000..f1f8c0b --- /dev/null +++ b/design/user-stories/us-006-reduce-teleport-warmup.md @@ -0,0 +1,28 @@ +--- +type: User Story +title: "US-006: Reduce the base teleport warm-up" +description: Let players reduce and eventually eliminate their base teleport warm-up by building inside their base. +status: in-progress +--- + +# US-006: Reduce the base teleport warm-up + +As a **player with Base III**, I want continued building to shorten my `/base` warm-up so that returning home becomes increasingly convenient. + +## Acceptance criteria + +- [ ] Warm-up progression requires Base III. +- [ ] The qualifying placement counter from the Base III unlock is retained and used cumulatively. +- [ ] Only Survival-mode placements inside the base's current horizontal and vertical bounds count. +- [ ] A configurable 200 total placements grants the initial 30-second warm-up by default. +- [ ] A configurable 1,000 total placements reduces the warm-up from 30 to 15 seconds by default. +- [ ] A configurable 2,000 total placements reduces the warm-up from 15 to 5 seconds by default. +- [ ] A configurable 12,000 total placements removes the warm-up by default. +- [ ] Each tier must be earned sequentially, and progress is preserved when the base is relocated. +- [ ] An instant warm-up does not bypass destination safety validation or cooldown enforcement. + +## Related + +- [US-005: Unlock Base III teleportation](us-005-unlock-base-teleportation.md) +- [US-008: Unlock Base IV visitor access](us-008-unlock-visitor-access.md) +- [US-011: Configure and persist progression](us-011-configure-and-persist-progression.md) diff --git a/design/user-stories/us-007-reduce-teleport-cooldown.md b/design/user-stories/us-007-reduce-teleport-cooldown.md new file mode 100644 index 0000000..f56cb0a --- /dev/null +++ b/design/user-stories/us-007-reduce-teleport-cooldown.md @@ -0,0 +1,29 @@ +--- +type: User Story +title: "US-007: Reduce the base teleport cooldown" +description: Let players reduce and eventually eliminate their base teleport cooldown by breaking blocks inside their base. +status: in-progress +--- + +# US-007: Reduce the base teleport cooldown + +As a **player with Base III**, I want work performed inside my base to shorten the `/base` cooldown so that I can return more frequently. + +## Acceptance criteria + +- [ ] Cooldown-reduction progress requires Base III. +- [ ] Any block broken in Survival mode inside the base's current horizontal and vertical bounds contributes unless excluded by configuration. +- [ ] Player-placed blocks may be broken repeatedly for progress. +- [ ] The default cooldown is three hours before any cooldown-reduction milestone. +- [ ] A configurable 1,000 cumulative blocks reduces the cooldown from three to two hours by default. +- [ ] A configurable 2,000 cumulative blocks reduces the cooldown from two hours to one hour by default. +- [ ] A configurable 3,000 cumulative blocks reduces the cooldown from one hour to 30 minutes by default. +- [ ] A configurable 5,000 cumulative blocks removes the cooldown by default. +- [ ] Each tier is sequential and relocating the base preserves earned tiers and progress. +- [ ] An instant cooldown still enforces the applicable teleport warm-up and destination safety checks. + +## Related + +- [US-005: Unlock Base III teleportation](us-005-unlock-base-teleportation.md) +- [US-006: Reduce the base teleport warm-up](us-006-reduce-teleport-warmup.md) +- [US-008: Unlock Base IV visitor access](us-008-unlock-visitor-access.md) diff --git a/design/user-stories/us-008-unlock-visitor-access.md b/design/user-stories/us-008-unlock-visitor-access.md new file mode 100644 index 0000000..9901de5 --- /dev/null +++ b/design/user-stories/us-008-unlock-visitor-access.md @@ -0,0 +1,36 @@ +--- +type: User Story +title: "US-008: Unlock Base IV visitor access" +description: Let players spend diamonds to permit controlled, cooldown-limited visitor teleports to their base. +status: in-progress +--- + +# US-008: Unlock Base IV visitor access + +As a **player with Base III**, I want to open my base to visitors so that other players can conveniently join me there under my control. + +## Acceptance criteria + +- [ ] Base IV requires Base III and an established base. +- [ ] `/base upgrade` offers the Base IV purchase for a configurable price that defaults to 128 diamonds. +- [ ] A successful purchase removes the complete price atomically from the player's direct inventory. +- [ ] Insufficient funds, an invalid state, or a failed persistence operation does not consume any diamonds or grant Base IV. +- [ ] `/basevisitors` lets a Base IV owner toggle visitor access on and off. +- [ ] The visitor-access preference persists across reconnects and restarts. +- [ ] `/gotobase ` autocompletes bases that the requesting player is currently eligible to visit. +- [ ] Enabled bases remain visitable while their owners are offline. +- [ ] A visitor teleport uses the destination owner's current warm-up tier. +- [ ] Looking around is permitted, while movement between block coordinates, damage, teleportation, world change, death, logout, or a conflicting teleport cancels the visitor warm-up. +- [ ] Cancellation or destination failure does not consume a visitor cooldown. +- [ ] A safe destination is resolved at or near the owner's recorded base center. +- [ ] Each visitor has an independent cooldown for each destination owner. +- [ ] On successful teleport, the visitor cooldown duration is captured from the destination owner's current cooldown tier. +- [ ] A later owner cooldown upgrade applies to future visits without rewriting a cooldown already in progress. +- [ ] Visiting another base does not consume or modify the owner's personal `/base` cooldown or the visitor's personal `/base` cooldown. +- [ ] Disabling visits prevents new requests but does not interrupt a teleport that has already completed. + +## Related + +- [US-005: Unlock Base III teleportation](us-005-unlock-base-teleportation.md) +- [US-006: Reduce the base teleport warm-up](us-006-reduce-teleport-warmup.md) +- [US-007: Reduce the base teleport cooldown](us-007-reduce-teleport-cooldown.md) diff --git a/design/user-stories/us-009-view-progression-and-notifications.md b/design/user-stories/us-009-view-progression-and-notifications.md new file mode 100644 index 0000000..d299a81 --- /dev/null +++ b/design/user-stories/us-009-view-progression-and-notifications.md @@ -0,0 +1,30 @@ +--- +type: User Story +title: "US-009: View progression and unlock notifications" +description: Give players clear command, boss-bar, and full-screen feedback about their progression. +status: in-progress +--- + +# US-009: View progression and unlock notifications + +As a **player**, I want to inspect my progression and receive timely milestone feedback so that I understand what I can unlock next. + +## Acceptance criteria + +- [ ] `/baseprogress` shows the player's Base, Base Size, Base Flight, Teleport Warm-up, and Teleport Cooldown paths. +- [ ] Each path identifies earned levels, unmet prerequisites, current progress, the next threshold, and the next reward. +- [ ] Locked secondary paths clearly identify Base I or another sequential level as their prerequisite. +- [ ] Relevant qualifying activity briefly displays a configurable progress boss bar for the active milestone. +- [ ] Boss-bar text and fill accurately represent the current count and threshold and never exceed 100 percent. +- [ ] The automatic boss bar disappears after a configurable number of seconds. +- [ ] `/baseprogress bossbar` toggles automatic progress boss bars on and off. +- [ ] Disabling automatic boss bars does not prevent `/baseprogress` from displaying progress. +- [ ] The boss-bar preference persists across reconnects and restarts. +- [ ] Each newly unlocked level displays prominent full-screen title and subtitle text describing the reward. +- [ ] Unlock notifications occur once per earned level and do not repeat after reconnecting or restarting. + +## Related + +- [US-001: Unlock and establish Base I](us-001-unlock-and-establish-base.md) +- [US-004: Unlock and control base flight](us-004-unlock-and-control-base-flight.md) +- [US-010: Administer player progression](us-010-administer-player-progression.md) diff --git a/design/user-stories/us-010-administer-player-progression.md b/design/user-stories/us-010-administer-player-progression.md new file mode 100644 index 0000000..b9220c1 --- /dev/null +++ b/design/user-stories/us-010-administer-player-progression.md @@ -0,0 +1,31 @@ +--- +type: User Story +title: "US-010: Administer player progression" +description: Let administrators inspect and safely modify player progression and live progression settings through commands. +status: in-progress +--- + +# US-010: Administer player progression + +As a **server administrator**, I want command-based progression controls so that I can inspect players, correct state, and tune requirements without an inventory UI. + +## Acceptance criteria + +- [ ] Administrative commands require `spigotbase.admin`, which server operators receive by default. +- [ ] Administrative player arguments safely resolve online players and previously known offline players. +- [ ] Player state remains keyed by UUID while retaining the latest known name for lookup and display. +- [ ] `/baseadmin progress ` displays the player's base, counters, earned path levels, active cooldowns, toggles, and visitor settings. +- [ ] `/baseadmin setlevel ` sets an earned path level while enforcing or explicitly granting required preceding levels. +- [ ] `/baseadmin setprogress ` updates the selected counter and consistently evaluates reached tiers. +- [ ] `/baseadmin reset ` resets a selected path without silently leaving benefits that require it. +- [ ] `/baseadmin reset all` removes the player's base, progression, active cooldowns, and plugin preferences after confirmation. +- [ ] Administrators can clear personal and visitor cooldowns independently. +- [ ] Administrative commands can update configured block requirements, warm-ups, and cooldowns for each level using validated values. +- [ ] Runtime configuration changes are persisted for subsequent restarts. +- [ ] Lowered progression requirements are evaluated for a player on their next relevant action rather than immediately updating every stored player. +- [ ] Every successful mutation reports exactly what changed, and invalid requests make no partial changes. + +## Related + +- [US-009: View progression and unlock notifications](us-009-view-progression-and-notifications.md) +- [US-011: Configure and persist progression](us-011-configure-and-persist-progression.md) diff --git a/design/user-stories/us-011-configure-and-persist-progression.md b/design/user-stories/us-011-configure-and-persist-progression.md new file mode 100644 index 0000000..9ba32cb --- /dev/null +++ b/design/user-stories/us-011-configure-and-persist-progression.md @@ -0,0 +1,30 @@ +--- +type: User Story +title: "US-011: Configure and persist progression" +description: Give operators validated configuration and durable, defensive storage for all base progression behavior. +status: in-progress +--- + +# US-011: Configure and persist progression + +As a **server operator**, I want progression behavior to be configurable and durable so that the plugin remains predictable across restarts and server changes. + +## Acceptance criteria + +- [ ] Configuration supports all qualifying materials, progression thresholds, radii, vertical flight limits, warning-buffer distance, warm-ups, cooldowns, prices, particle settings, and notification durations. +- [ ] Default values match the progression requirements documented by the related user stories. +- [ ] Thresholds and levels are validated as nonnegative, representable, and sequentially coherent where required. +- [ ] Radii, vertical ranges, durations, and prices reject unsafe or nonsensical values. +- [ ] Invalid required configuration prevents partial plugin initialization and produces a clear server log message. +- [ ] UUID-keyed state persists latest known names, base locations, counters, levels, relocation times, teleport times, visitor cooldowns, navigation preferences, flight preferences, boss-bar preferences, and visitor settings. +- [ ] Cooldowns and relocation limits use real elapsed timestamps and continue while players are offline. +- [ ] State is saved safely so a failed write does not replace valid persisted state with a partial document. +- [ ] Corrupt, unknown, or invalid records are handled defensively and cannot silently grant progression or privileges. +- [ ] Unknown forward-compatible configuration and state fields are preserved where practical. + +## Related + +- [US-001: Unlock and establish Base I](us-001-unlock-and-establish-base.md) +- [US-003: Expand the base](us-003-expand-the-base.md) +- [US-010: Administer player progression](us-010-administer-player-progression.md) +- [US-012: Build and release the plugin](us-012-build-and-release-plugin.md) diff --git a/design/user-stories/us-012-build-and-release-plugin.md b/design/user-stories/us-012-build-and-release-plugin.md new file mode 100644 index 0000000..d073e36 --- /dev/null +++ b/design/user-stories/us-012-build-and-release-plugin.md @@ -0,0 +1,27 @@ +--- +type: User Story +title: "US-012: Build and release the plugin" +description: Give maintainers repeatable Spigot builds, automated verification, and versioned Gitea releases. +status: in-progress +--- + +# US-012: Build and release the plugin + +As a **plugin maintainer**, I want automated builds and releases modeled on Trigger Spawn so that tested, correctly versioned artifacts can be distributed consistently. + +## Acceptance criteria + +- [ ] The Gradle project compiles against Spigot API `26.2-R0.1-SNAPSHOT` using a Java 17 toolchain. +- [ ] Compiler lint warnings fail the build. +- [ ] Automated JUnit 5 tests run as part of the Gradle check lifecycle. +- [ ] Pushes and pull requests build and test the plugin in Gitea Actions. +- [ ] Pull requests validate conventional commit messages. +- [ ] CI stores a development JAR as a workflow artifact. +- [ ] Main-branch conventional commits drive semantic versioning. +- [ ] A successful release builds a versioned JAR and attaches it to the corresponding Gitea release. +- [ ] Build files, Gradle wrapper, workflows, and release behavior follow `../spigot-trigger-spawn/` where applicable while using Spigot Base names and identifiers. + +## Related + +- [US-011: Configure and persist progression](us-011-configure-and-persist-progression.md) +- [User-story catalog](index.md) diff --git a/gradle/gradlew b/gradle/gradlew new file mode 100755 index 0000000..203529c --- /dev/null +++ b/gradle/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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 +# + +############################################################################## +# +# gradlew 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 gradlew +# +# 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/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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\n' "$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 + + + +# 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" ) + + 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='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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/gradle/gradlew.bat b/gradle/gradlew.bat new file mode 100644 index 0000000..7e60b72 --- /dev/null +++ b/gradle/gradlew.bat @@ -0,0 +1,82 @@ +@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 gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +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=-Dfile.encoding=UTF-8 "-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 + +"%COMSPEC%" /c exit 1 + +: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 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..b1b8ef56b44f16b14dc800fa8103a6d89abb526f GIT binary patch literal 48462 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 R2np~f1o-$>Q}y+){|A@R9n$~+ literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a351597 --- /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-9.6.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..203529c --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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 +# + +############################################################################## +# +# gradlew 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 gradlew +# +# 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/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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\n' "$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 + + + +# 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" ) + + 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='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..7e60b72 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,82 @@ +@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 gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +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=-Dfile.encoding=UTF-8 "-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 + +"%COMSPEC%" /c exit 1 + +: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 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..bf3d402 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "spigot-base" diff --git a/src/main/java/games/dmg/spigotbase/AdminProgressionService.java b/src/main/java/games/dmg/spigotbase/AdminProgressionService.java new file mode 100644 index 0000000..2ebeca1 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/AdminProgressionService.java @@ -0,0 +1,83 @@ +package games.dmg.spigotbase; + +public final class AdminProgressionService { + public PlayerState setLevel(PlayerState player, ProgressionPath path, int level) { + int base = player.baseLevel(); + int size = player.sizeLevel(); + int flight = player.flightLevel(); + int warmup = player.warmupLevel(); + int cooldown = player.cooldownLevel(); + + switch (path) { + case BASE -> { + requireRange(level, 0, 4, "base"); + base = level; + if (base < 3) { + warmup = 0; + cooldown = 0; + } + if (base < 1) { + size = 0; + flight = 0; + } + } + case SIZE -> { + requireRange(level, 0, 3, "size"); + size = level; + if (level > 0) { + base = Math.max(base, 1); + } + } + case FLIGHT -> { + requireRange(level, 0, 3, "flight"); + flight = level; + if (level > 0) { + base = Math.max(base, 1); + } + } + case WARMUP -> { + requireRange(level, 0, 3, "warm-up"); + warmup = level; + if (level > 0) { + base = Math.max(base, 3); + } + } + case COOLDOWN -> { + requireRange(level, 0, 4, "cooldown"); + cooldown = level; + if (level > 0) { + base = Math.max(base, 3); + } + } + } + + boolean navigationEnabled = base >= 2 && player.navigationEnabled(); + boolean flightEnabled = flight > 0 && player.flightEnabled(); + boolean visitorsEnabled = base >= 4 && player.visitorsEnabled(); + if (path == ProgressionPath.BASE) { + navigationEnabled = base >= 2; + visitorsEnabled = base >= 4; + } + if (path == ProgressionPath.FLIGHT) { + flightEnabled = flight > 0; + } + return player.withAdministrativeLevels( + base, + size, + flight, + warmup, + cooldown, + navigationEnabled, + flightEnabled, + visitorsEnabled + ); + } + + private static void requireRange(int value, int minimum, int maximum, String path) { + if (value < minimum || value > maximum) { + throw new IllegalArgumentException( + path + " level must be between " + minimum + " and " + maximum + ); + } + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseAdminCommand.java b/src/main/java/games/dmg/spigotbase/BaseAdminCommand.java new file mode 100644 index 0000000..2d7af0f --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseAdminCommand.java @@ -0,0 +1,172 @@ +package games.dmg.spigotbase; + +import java.util.Arrays; +import java.util.Locale; +import java.util.Optional; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +final class BaseAdminCommand implements CommandExecutor { + private final BaseStateManager stateManager; + private final AdminProgressionService progressionService; + + BaseAdminCommand(BaseStateManager stateManager, AdminProgressionService progressionService) { + this.stateManager = stateManager; + this.progressionService = progressionService; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!sender.hasPermission("spigotbase.admin")) { + sender.sendMessage(ChatColor.RED + "You do not have permission to administer Spigot Base."); + return true; + } + if (arguments.length < 2) { + sendUsage(sender); + return true; + } + Optional target = resolve(arguments[1]); + if (target.isEmpty()) { + sender.sendMessage(ChatColor.RED + "That player is not online or previously known."); + return true; + } + return switch (arguments[0].toLowerCase(Locale.ROOT)) { + case "progress" -> showProgress(sender, target.orElseThrow()); + case "setlevel" -> setLevel(sender, target.orElseThrow(), arguments); + case "clearcooldown" -> clearCooldown(sender, target.orElseThrow(), arguments); + case "reset" -> reset(sender, target.orElseThrow(), arguments); + default -> { + sendUsage(sender); + yield true; + } + }; + } + + private boolean showProgress(CommandSender sender, PlayerState player) { + sender.sendMessage(ChatColor.GOLD + "=== " + player.latestName() + " Base Progress ==="); + sender.sendMessage(ChatColor.YELLOW + "Levels: base=" + player.baseLevel() + + " size=" + player.sizeLevel() + " flight=" + player.flightLevel() + + " warmup=" + player.warmupLevel() + " cooldown=" + player.cooldownLevel()); + sender.sendMessage(ChatColor.GRAY + "Grass/dirt=" + player.grassAndDirtBroken() + + " stone=" + player.stoneBroken() + " deepslate=" + player.deepslateBroken() + + " obsidian=" + player.obsidianBroken()); + sender.sendMessage(ChatColor.GRAY + "In-base placements=" + player.blocksPlacedInBase() + + " breaks=" + player.blocksBrokenInBase()); + sender.sendMessage(ChatColor.GRAY + "Toggles: navigation=" + player.navigationEnabled() + + " flight=" + player.flightEnabled() + " bossbar=" + player.bossBarEnabled() + + " visitors=" + player.visitorsEnabled()); + sender.sendMessage(ChatColor.GRAY + "Base: " + player.base() + .map(base -> base.worldName() + " " + base.x() + "," + base.y() + "," + base.z()) + .orElse("not set")); + sender.sendMessage(ChatColor.GRAY + "Visitor cooldowns=" + player.visitorCooldownUntil().size()); + return true; + } + + private boolean setLevel( + CommandSender sender, + PlayerState target, + String[] arguments + ) { + if (arguments.length != 4) { + sender.sendMessage(ChatColor.RED + "Usage: /baseadmin setlevel "); + return true; + } + try { + ProgressionPath path = ProgressionPath.valueOf(arguments[2].toUpperCase(Locale.ROOT)); + int level = Integer.parseInt(arguments[3]); + PlayerState updated = stateManager.update( + target.playerId(), + target.latestName(), + current -> progressionService.setLevel(current, path, level) + ); + stateManager.saveIfDirty(); + sender.sendMessage(ChatColor.GREEN + "Set " + updated.latestName() + "'s " + + path.name().toLowerCase(Locale.ROOT) + " level to " + level + "."); + } catch (IllegalArgumentException exception) { + sender.sendMessage(ChatColor.RED + exception.getMessage()); + } + return true; + } + + private boolean clearCooldown( + CommandSender sender, + PlayerState target, + String[] arguments + ) { + String selection = arguments.length >= 3 + ? arguments[2].toLowerCase(Locale.ROOT) + : "all"; + if (!Arrays.asList("personal", "visitor", "all").contains(selection)) { + sender.sendMessage(ChatColor.RED + + "Usage: /baseadmin clearcooldown [personal|visitor|all]"); + return true; + } + stateManager.update(target.playerId(), target.latestName(), current -> { + PlayerState updated = current; + if (selection.equals("personal") || selection.equals("all")) { + updated = updated.withoutPersonalCooldown(); + } + if (selection.equals("visitor") || selection.equals("all")) { + updated = updated.withoutVisitorCooldowns(); + } + return updated; + }); + stateManager.saveIfDirty(); + sender.sendMessage(ChatColor.GREEN + "Cleared " + selection + " cooldowns for " + + target.latestName() + "."); + return true; + } + + private boolean reset(CommandSender sender, PlayerState target, String[] arguments) { + if (arguments.length < 3) { + sender.sendMessage(ChatColor.RED + "Usage: /baseadmin reset [confirm]"); + return true; + } + if (arguments[2].equalsIgnoreCase("all")) { + if (arguments.length != 4 || !arguments[3].equalsIgnoreCase("confirm")) { + sender.sendMessage(ChatColor.RED + "Repeat with: /baseadmin reset " + + target.latestName() + " all confirm"); + return true; + } + stateManager.update( + target.playerId(), + target.latestName(), + ignored -> PlayerState.newPlayer(target.playerId(), target.latestName()) + ); + stateManager.saveIfDirty(); + sender.sendMessage(ChatColor.GREEN + "Reset all progression for " + target.latestName() + "."); + return true; + } + try { + ProgressionPath path = ProgressionPath.valueOf(arguments[2].toUpperCase(Locale.ROOT)); + stateManager.update( + target.playerId(), + target.latestName(), + current -> progressionService.setLevel(current, path, 0) + ); + stateManager.saveIfDirty(); + sender.sendMessage(ChatColor.GREEN + "Reset " + path.name().toLowerCase(Locale.ROOT) + + " progression for " + target.latestName() + "."); + } catch (IllegalArgumentException exception) { + sender.sendMessage(ChatColor.RED + exception.getMessage()); + } + return true; + } + + private Optional resolve(String name) { + Player online = Bukkit.getPlayerExact(name); + if (online != null) { + return Optional.of(stateManager.player(online.getUniqueId(), online.getName())); + } + return stateManager.findByName(name); + } + + private static void sendUsage(CommandSender sender) { + sender.sendMessage(ChatColor.YELLOW + "Usage: /baseadmin " + + " ..."); + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseArea.java b/src/main/java/games/dmg/spigotbase/BaseArea.java new file mode 100644 index 0000000..f2009c2 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseArea.java @@ -0,0 +1,27 @@ +package games.dmg.spigotbase; + +import java.util.UUID; + +public record BaseArea(BaseLocation center, int radius, int verticalRange) { + public BaseArea { + if (center == null) { + throw new IllegalArgumentException("center is required"); + } + if (radius <= 0 || verticalRange <= 0) { + throw new IllegalArgumentException("base dimensions must be positive"); + } + } + + public boolean contains(UUID worldId, int x, int y, int z) { + if (!center.worldId().equals(worldId)) { + return false; + } + long deltaX = (long) x - center.x(); + long deltaZ = (long) z - center.z(); + long horizontalDistanceSquared = deltaX * deltaX + deltaZ * deltaZ; + long radiusSquared = (long) radius * radius; + long minimumY = (long) center.y() - verticalRange; + long maximumY = (long) center.y() + verticalRange; + return horizontalDistanceSquared <= radiusSquared && y >= minimumY && y <= maximumY; + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseBoundsService.java b/src/main/java/games/dmg/spigotbase/BaseBoundsService.java new file mode 100644 index 0000000..8b58041 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseBoundsService.java @@ -0,0 +1,35 @@ +package games.dmg.spigotbase; + +public final class BaseBoundsService { + private final PluginSettings settings; + + public BaseBoundsService(PluginSettings settings) { + this.settings = settings; + } + + public int radius(PlayerState player) { + return switch (player.sizeLevel()) { + case 0 -> settings.initialRadius(); + case 1 -> settings.firstExpandedRadius(); + case 2 -> settings.secondExpandedRadius(); + case 3 -> settings.thirdExpandedRadius(); + default -> throw new IllegalArgumentException("unknown size level"); + }; + } + + public int verticalRange(PlayerState player) { + return switch (player.flightLevel()) { + case 0, 1 -> settings.initialVerticalRange(); + case 2 -> settings.secondFlightVerticalRange(); + case 3 -> Integer.MAX_VALUE; + default -> throw new IllegalArgumentException("unknown flight level"); + }; + } + + public BaseArea area(PlayerState player) { + BaseLocation base = player.base().orElseThrow(() -> + new IllegalStateException("player has not established a base") + ); + return new BaseArea(base, radius(player), verticalRange(player)); + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseCommand.java b/src/main/java/games/dmg/spigotbase/BaseCommand.java new file mode 100644 index 0000000..f40b923 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseCommand.java @@ -0,0 +1,123 @@ +package games.dmg.spigotbase; + +import java.io.IOException; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; + +final class BaseCommand implements CommandExecutor { + private final BaseTeleportManager teleportManager; + private final BaseStateManager stateManager; + private final VisitorPolicy visitorPolicy; + private final PluginSettings settings; + + BaseCommand( + BaseTeleportManager teleportManager, + BaseStateManager stateManager, + VisitorPolicy visitorPolicy, + PluginSettings settings + ) { + this.teleportManager = teleportManager; + this.stateManager = stateManager; + this.visitorPolicy = visitorPolicy; + this.settings = settings; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!(sender instanceof Player player)) { + sender.sendMessage("Only players can use a base."); + return true; + } + if (arguments.length == 0) { + teleportManager.start(player); + return true; + } + if (arguments.length == 1 && arguments[0].equalsIgnoreCase("upgrade")) { + purchaseVisitorAccess(player); + return true; + } + player.sendMessage(ChatColor.RED + "Usage: /base [upgrade]"); + return true; + } + + private void purchaseVisitorAccess(Player player) { + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (!visitorPolicy.canPurchase(state)) { + player.sendMessage(ChatColor.RED + (state.baseLevel() >= 4 + ? "Base IV is already unlocked." + : "You must unlock Base III before purchasing Base IV.")); + return; + } + int price = settings.visitorUnlockDiamondCost(); + PlayerInventory inventory = player.getInventory(); + if (countDiamonds(inventory) < price) { + player.sendMessage(ChatColor.RED + "Base IV costs " + price + " diamonds."); + return; + } + ItemStack[] snapshot = cloneContents(inventory.getStorageContents()); + removeDiamonds(inventory, price); + try { + stateManager.updateAndSave( + player.getUniqueId(), + player.getName(), + current -> current.withBaseLevel(4).withVisitorsEnabled(true) + ); + } catch (IOException | RuntimeException exception) { + inventory.setStorageContents(snapshot); + player.sendMessage(ChatColor.RED + "The upgrade could not be saved; your diamonds were restored."); + return; + } + player.sendTitle( + ChatColor.GOLD + "Base IV Unlocked", + ChatColor.YELLOW + "Visitors may now teleport to your base", + 10, 70, 20 + ); + player.sendMessage(ChatColor.GREEN + "Base IV unlocked for " + price + " diamonds."); + } + + private static int countDiamonds(PlayerInventory inventory) { + int count = 0; + for (ItemStack item : inventory.getStorageContents()) { + if (item != null && item.getType() == Material.DIAMOND) { + count += item.getAmount(); + } + } + return count; + } + + private static void removeDiamonds(PlayerInventory inventory, int amount) { + ItemStack[] contents = inventory.getStorageContents(); + int remaining = amount; + for (int index = 0; index < contents.length && remaining > 0; index++) { + ItemStack item = contents[index]; + if (item == null || item.getType() != Material.DIAMOND) { + continue; + } + int removed = Math.min(remaining, item.getAmount()); + remaining -= removed; + int newAmount = item.getAmount() - removed; + if (newAmount == 0) { + contents[index] = null; + } else { + ItemStack reduced = item.clone(); + reduced.setAmount(newAmount); + contents[index] = reduced; + } + } + inventory.setStorageContents(contents); + } + + private static ItemStack[] cloneContents(ItemStack[] contents) { + ItemStack[] copy = new ItemStack[contents.length]; + for (int index = 0; index < contents.length; index++) { + copy[index] = contents[index] == null ? null : contents[index].clone(); + } + return copy; + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseFlightCommand.java b/src/main/java/games/dmg/spigotbase/BaseFlightCommand.java new file mode 100644 index 0000000..b9e9345 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseFlightCommand.java @@ -0,0 +1,43 @@ +package games.dmg.spigotbase; + +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +final class BaseFlightCommand implements CommandExecutor { + private final BaseStateManager stateManager; + private final BaseFlightController controller; + + BaseFlightCommand(BaseStateManager stateManager, BaseFlightController controller) { + this.stateManager = stateManager; + this.controller = controller; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!(sender instanceof Player player)) { + sender.sendMessage("Only players can use base flight."); + return true; + } + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (state.flightLevel() < 1) { + player.sendMessage(ChatColor.RED + "Base flight is still locked."); + return true; + } + state = stateManager.update( + player.getUniqueId(), + player.getName(), + current -> current.withFlightEnabled(!current.flightEnabled()) + ); + if (!state.flightEnabled()) { + controller.removeGrantedFlight(player); + } + stateManager.saveIfDirty(); + player.sendMessage(ChatColor.YELLOW + "Base flight is now " + + (state.flightEnabled() ? ChatColor.GREEN + "on" : ChatColor.RED + "off") + + ChatColor.YELLOW + "."); + return true; + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseFlightController.java b/src/main/java/games/dmg/spigotbase/BaseFlightController.java new file mode 100644 index 0000000..2d67085 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseFlightController.java @@ -0,0 +1,156 @@ +package games.dmg.spigotbase; + +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import org.bukkit.ChatColor; +import org.bukkit.GameMode; +import org.bukkit.Material; +import org.bukkit.Server; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +final class BaseFlightController implements Runnable { + private final Server server; + private final BaseStateManager stateManager; + private final SecondaryProgressionService progressionService; + private final BaseBoundsService boundsService; + private final PluginSettings settings; + private final Set grantedFlight = new HashSet<>(); + private final Set warned = new HashSet<>(); + + BaseFlightController( + Server server, + BaseStateManager stateManager, + SecondaryProgressionService progressionService, + BaseBoundsService boundsService, + PluginSettings settings + ) { + this.server = server; + this.stateManager = stateManager; + this.progressionService = progressionService; + this.boundsService = boundsService; + this.settings = settings; + } + + @Override + public void run() { + for (Player player : server.getOnlinePlayers()) { + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (player.getGameMode() == GameMode.SURVIVAL) { + state = observeElytra(player, state); + } + applyFlight(player, state); + } + grantedFlight.removeIf(id -> server.getPlayer(id) == null); + warned.removeIf(id -> server.getPlayer(id) == null); + } + + void removeGrantedFlight(Player player) { + UUID playerId = player.getUniqueId(); + warned.remove(playerId); + if (grantedFlight.remove(playerId) + && player.getGameMode() != GameMode.CREATIVE + && player.getGameMode() != GameMode.SPECTATOR) { + player.setFlying(false); + player.setAllowFlight(false); + } + } + + void removeAllGrantedFlight() { + for (UUID playerId : Set.copyOf(grantedFlight)) { + Player player = server.getPlayer(playerId); + if (player != null) { + removeGrantedFlight(player); + } + } + grantedFlight.clear(); + warned.clear(); + } + + private PlayerState observeElytra(Player player, PlayerState state) { + int count = countElytra(player); + ProgressionUpdate update = progressionService.observeElytraCount(state, count); + if (!update.unlockedFlightLevel()) { + return state; + } + PlayerState updated = stateManager.update( + player.getUniqueId(), player.getName(), ignored -> update.player() + ); + stateManager.saveIfDirty(); + player.sendTitle( + ChatColor.GOLD + "Base Flight " + roman(updated.flightLevel()) + " Unlocked", + ChatColor.YELLOW + "Use /baseflight to toggle flight", + 10, 70, 20 + ); + return updated; + } + + private void applyFlight(Player player, PlayerState state) { + if (player.getGameMode() != GameMode.SURVIVAL + || !state.flightEnabled() || state.flightLevel() < 1 || state.base().isEmpty()) { + removeGrantedFlight(player); + return; + } + BaseLocation base = state.base().orElseThrow(); + if (!player.getWorld().getUID().equals(base.worldId()) || !withinVerticalRange(player, state, base)) { + removeGrantedFlight(player); + return; + } + double deltaX = player.getLocation().getX() - (base.x() + 0.5); + double deltaZ = player.getLocation().getZ() - (base.z() + 0.5); + double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; + int radius = boundsService.radius(state); + int bufferedRadius = radius + settings.flightWarningBuffer(); + if (distanceSquared > (double) bufferedRadius * bufferedRadius) { + removeGrantedFlight(player); + return; + } + if (!player.getAllowFlight()) { + player.setAllowFlight(true); + grantedFlight.add(player.getUniqueId()); + } + if (distanceSquared > (double) radius * radius) { + if (warned.add(player.getUniqueId())) { + player.sendTitle( + ChatColor.RED + "Leaving Your Base", + ChatColor.YELLOW + "Turn back before base flight ends", + 0, 30, 10 + ); + } + } else { + warned.remove(player.getUniqueId()); + } + } + + private boolean withinVerticalRange(Player player, PlayerState state, BaseLocation base) { + int y = player.getLocation().getBlockY(); + if (state.flightLevel() == 3) { + return y >= player.getWorld().getMinHeight() && y < player.getWorld().getMaxHeight(); + } + return Math.abs((long) y - base.y()) <= boundsService.verticalRange(state); + } + + private static int countElytra(Player player) { + int count = 0; + for (ItemStack item : player.getInventory().getStorageContents()) { + if (item != null && item.getType() == Material.ELYTRA) { + count += item.getAmount(); + } + } + ItemStack chest = player.getInventory().getChestplate(); + if (chest != null && chest.getType() == Material.ELYTRA) { + count += chest.getAmount(); + } + return Math.min(3, count); + } + + private static String roman(int level) { + return switch (level) { + case 1 -> "I"; + case 2 -> "II"; + case 3 -> "III"; + default -> Integer.toString(level); + }; + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseLocation.java b/src/main/java/games/dmg/spigotbase/BaseLocation.java new file mode 100644 index 0000000..007533d --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseLocation.java @@ -0,0 +1,25 @@ +package games.dmg.spigotbase; + +import java.util.UUID; + +public record BaseLocation( + UUID worldId, + String worldName, + int x, + int y, + int z, + float yaw, + float pitch +) { + public BaseLocation { + if (worldId == null) { + throw new IllegalArgumentException("world ID is required"); + } + if (worldName == null || worldName.isBlank()) { + throw new IllegalArgumentException("world name is required"); + } + if (!Float.isFinite(yaw) || !Float.isFinite(pitch)) { + throw new IllegalArgumentException("rotation must be finite"); + } + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseNavigationCommand.java b/src/main/java/games/dmg/spigotbase/BaseNavigationCommand.java new file mode 100644 index 0000000..b10dc06 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseNavigationCommand.java @@ -0,0 +1,47 @@ +package games.dmg.spigotbase; + +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +final class BaseNavigationCommand implements CommandExecutor { + private final BaseStateManager stateManager; + + BaseNavigationCommand(BaseStateManager stateManager) { + this.stateManager = stateManager; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!(sender instanceof Player player)) { + sender.sendMessage("Only players can use base navigation."); + return true; + } + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (state.baseLevel() < 2) { + player.sendMessage(ChatColor.RED + "Base II navigation is still locked."); + return true; + } + if (state.base().isEmpty()) { + player.sendMessage(ChatColor.RED + "Set your base before enabling navigation."); + return true; + } + state = stateManager.update( + player.getUniqueId(), + player.getName(), + current -> current.withNavigationEnabled(!current.navigationEnabled()) + ); + stateManager.saveIfDirty(); + player.sendMessage(ChatColor.YELLOW + "Base navigation is now " + + (state.navigationEnabled() ? ChatColor.GREEN + "on" : ChatColor.RED + "off") + + ChatColor.YELLOW + "."); + if (state.navigationEnabled() + && !player.getWorld().getUID().equals(state.base().orElseThrow().worldId())) { + player.sendMessage(ChatColor.RED + "Your base is in another world: " + + state.base().orElseThrow().worldName() + "."); + } + return true; + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseNavigationController.java b/src/main/java/games/dmg/spigotbase/BaseNavigationController.java new file mode 100644 index 0000000..a44a195 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseNavigationController.java @@ -0,0 +1,45 @@ +package games.dmg.spigotbase; + +import org.bukkit.Location; +import org.bukkit.Particle; +import org.bukkit.Server; +import org.bukkit.entity.Player; +import org.bukkit.util.Vector; + +final class BaseNavigationController implements Runnable { + private final Server server; + private final BaseStateManager stateManager; + + BaseNavigationController(Server server, BaseStateManager stateManager) { + this.server = server; + this.stateManager = stateManager; + } + + @Override + public void run() { + for (Player player : server.getOnlinePlayers()) { + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (!state.navigationEnabled() || state.base().isEmpty()) { + continue; + } + BaseLocation base = state.base().orElseThrow(); + if (!player.getWorld().getUID().equals(base.worldId())) { + continue; + } + Location origin = player.getLocation().clone().add(0.0, 0.15, 0.0); + Vector direction = new Vector( + base.x() + 0.5 - origin.getX(), + 0.0, + base.z() + 0.5 - origin.getZ() + ); + if (direction.lengthSquared() < 1.0) { + continue; + } + direction.normalize(); + for (int step = 1; step <= 5; step++) { + Location particle = origin.clone().add(direction.clone().multiply(step)); + player.spawnParticle(Particle.END_ROD, particle, 1, 0.0, 0.0, 0.0, 0.0); + } + } + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseProgressCommand.java b/src/main/java/games/dmg/spigotbase/BaseProgressCommand.java new file mode 100644 index 0000000..5336428 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseProgressCommand.java @@ -0,0 +1,121 @@ +package games.dmg.spigotbase; + +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +final class BaseProgressCommand implements CommandExecutor { + private final BaseStateManager stateManager; + private final PluginSettings settings; + private final TeleportPolicy teleportPolicy; + + BaseProgressCommand(BaseStateManager stateManager, PluginSettings settings) { + this.stateManager = stateManager; + this.settings = settings; + this.teleportPolicy = new TeleportPolicy(settings); + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!(sender instanceof Player player)) { + sender.sendMessage("Only players have base progression."); + return true; + } + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (arguments.length == 1 && arguments[0].equalsIgnoreCase("bossbar")) { + state = stateManager.update( + player.getUniqueId(), + player.getName(), + current -> current.withBossBarEnabled(!current.bossBarEnabled()) + ); + stateManager.saveIfDirty(); + player.sendMessage(ChatColor.YELLOW + "Automatic progress boss bars are now " + + (state.bossBarEnabled() ? ChatColor.GREEN + "on" : ChatColor.RED + "off") + + ChatColor.YELLOW + "."); + return true; + } + player.sendMessage(ChatColor.GOLD + "=== Base Progress ==="); + showBasePath(player, state); + showSizePath(player, state); + showFlightPath(player, state); + showWarmupPath(player, state); + showCooldownPath(player, state); + player.sendMessage(ChatColor.GRAY + "Boss bars: " + (state.bossBarEnabled() ? "on" : "off")); + state.base().ifPresentOrElse( + base -> player.sendMessage(ChatColor.GRAY + "Base: " + base.worldName() + " " + + base.x() + ", " + base.y() + ", " + base.z()), + () -> player.sendMessage(ChatColor.GRAY + "Base: not set") + ); + return true; + } + + private void showBasePath(Player player, PlayerState state) { + String detail = switch (state.baseLevel()) { + case 0 -> state.grassAndDirtBroken() + "/" + settings.baseUnlockBlocks() + + " grass or dirt → /setbase"; + case 1 -> state.grassAndDirtBroken() + "/" + settings.navigationUnlockBlocks() + + " grass or dirt → navigation"; + case 2 -> state.blocksPlacedInBase() + "/" + settings.teleportUnlockPlacements() + + " placements → /base"; + case 3 -> settings.visitorUnlockDiamondCost() + " diamonds → visitor access"; + case 4 -> "complete; visitor access unlocked"; + default -> "invalid"; + }; + player.sendMessage(ChatColor.YELLOW + "Base " + state.baseLevel() + "/4: " + + ChatColor.GRAY + detail); + } + + private void showSizePath(Player player, PlayerState state) { + String detail = switch (state.sizeLevel()) { + case 0 -> state.stoneBroken() + "/" + settings.stoneExpansionBlocks() + " stone"; + case 1 -> state.deepslateBroken() + "/" + settings.deepslateExpansionBlocks() + " deepslate"; + case 2 -> state.obsidianBroken() + "/" + settings.obsidianExpansionBlocks() + " obsidian"; + case 3 -> "complete; 150-block radius by default"; + default -> "invalid"; + }; + player.sendMessage(colorForPrerequisite(state.baseLevel() >= 1) + "Base Size " + + state.sizeLevel() + "/3: " + ChatColor.GRAY + detail); + } + + private void showFlightPath(Player player, PlayerState state) { + String detail = state.flightLevel() >= 3 + ? "complete; world build height" + : (state.flightLevel() + 1) + " simultaneous elytra required"; + player.sendMessage(colorForPrerequisite(state.baseLevel() >= 1) + "Base Flight " + + state.flightLevel() + "/3: " + ChatColor.GRAY + detail + + "; toggle=" + (state.flightEnabled() ? "on" : "off")); + } + + private void showWarmupPath(Player player, PlayerState state) { + String detail = switch (state.warmupLevel()) { + case 0 -> state.blocksPlacedInBase() + "/" + settings.secondWarmupPlacements(); + case 1 -> state.blocksPlacedInBase() + "/" + settings.thirdWarmupPlacements(); + case 2 -> state.blocksPlacedInBase() + "/" + settings.instantWarmupPlacements(); + case 3 -> "complete"; + default -> "invalid"; + }; + player.sendMessage(colorForPrerequisite(state.baseLevel() >= 3) + "Teleport Warm-up " + + state.warmupLevel() + "/3: " + ChatColor.GRAY + + DurationFormatter.friendly(teleportPolicy.warmup(state)) + "; " + detail); + } + + private void showCooldownPath(Player player, PlayerState state) { + String detail = switch (state.cooldownLevel()) { + case 0 -> state.blocksBrokenInBase() + "/" + settings.firstCooldownBreaks(); + case 1 -> state.blocksBrokenInBase() + "/" + settings.secondCooldownBreaks(); + case 2 -> state.blocksBrokenInBase() + "/" + settings.thirdCooldownBreaks(); + case 3 -> state.blocksBrokenInBase() + "/" + settings.instantCooldownBreaks(); + case 4 -> "complete"; + default -> "invalid"; + }; + player.sendMessage(colorForPrerequisite(state.baseLevel() >= 3) + "Teleport Cooldown " + + state.cooldownLevel() + "/4: " + ChatColor.GRAY + + DurationFormatter.friendly(teleportPolicy.cooldown(state)) + "; " + detail); + } + + private static ChatColor colorForPrerequisite(boolean met) { + return met ? ChatColor.YELLOW : ChatColor.RED; + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseProgressListener.java b/src/main/java/games/dmg/spigotbase/BaseProgressListener.java new file mode 100644 index 0000000..0251ff2 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseProgressListener.java @@ -0,0 +1,310 @@ +package games.dmg.spigotbase; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.GameMode; +import org.bukkit.Material; +import org.bukkit.boss.BarColor; +import org.bukkit.boss.BarStyle; +import org.bukkit.boss.BossBar; +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.plugin.Plugin; + +final class BaseProgressListener implements Listener { + private static final long BOSS_BAR_TICKS = 60L; + + private final Plugin plugin; + private final BaseStateManager stateManager; + private final BaseProgressionService baseProgressionService; + private final SecondaryProgressionService secondaryProgressionService; + private final TeleportProgressionService teleportProgressionService; + private final BaseBoundsService boundsService; + private final PluginSettings settings; + private final Map activeBossBars = new HashMap<>(); + + BaseProgressListener( + Plugin plugin, + BaseStateManager stateManager, + BaseProgressionService baseProgressionService, + SecondaryProgressionService secondaryProgressionService, + TeleportProgressionService teleportProgressionService, + BaseBoundsService boundsService, + PluginSettings settings + ) { + this.plugin = plugin; + this.stateManager = stateManager; + this.baseProgressionService = baseProgressionService; + this.secondaryProgressionService = secondaryProgressionService; + this.teleportProgressionService = teleportProgressionService; + this.boundsService = boundsService; + this.settings = settings; + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onBlockBreak(BlockBreakEvent event) { + Player player = event.getPlayer(); + Material material = event.getBlock().getType(); + if (player.getGameMode() != GameMode.SURVIVAL) { + return; + } + PlayerState before = stateManager.player(player.getUniqueId(), player.getName()); + boolean insideBase = isInsideBase( + before, + event.getBlock().getWorld().getUID(), + event.getBlock().getX(), + event.getBlock().getY(), + event.getBlock().getZ() + ); + if (!isProgressMaterial(material) && !(insideBase && before.baseLevel() >= 3)) { + return; + } + ProgressionUpdate[] updateHolder = new ProgressionUpdate[1]; + PlayerState state = stateManager.update(player.getUniqueId(), player.getName(), current -> { + ProgressionUpdate materialUpdate = updateForMaterial(current, material); + ProgressionUpdate breakUpdate = insideBase + ? teleportProgressionService.recordBreak(materialUpdate.player()) + : ProgressionUpdate.unchanged(materialUpdate.player()); + ProgressionUpdate combined = combine(materialUpdate, breakUpdate); + updateHolder[0] = combined; + return combined.player(); + }); + ProgressionUpdate update = updateHolder[0]; + announceUnlock(player, update); + if (hasUnlock(update)) { + stateManager.saveIfDirty(); + } + if (state.bossBarEnabled()) { + if (insideBase && before.baseLevel() >= 3) { + showProgress(player, cooldownDisplay(state)); + } else { + showProgress(player, progressDisplay(state, material)); + } + } + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onBlockPlace(BlockPlaceEvent event) { + Player player = event.getPlayer(); + if (player.getGameMode() != GameMode.SURVIVAL) { + return; + } + PlayerState before = stateManager.player(player.getUniqueId(), player.getName()); + if (!isInsideBase( + before, + event.getBlockPlaced().getWorld().getUID(), + event.getBlockPlaced().getX(), + event.getBlockPlaced().getY(), + event.getBlockPlaced().getZ())) { + return; + } + ProgressionUpdate[] updateHolder = new ProgressionUpdate[1]; + PlayerState state = stateManager.update(player.getUniqueId(), player.getName(), current -> { + ProgressionUpdate update = teleportProgressionService.recordPlacement(current); + updateHolder[0] = update; + return update.player(); + }); + ProgressionUpdate update = updateHolder[0]; + announceUnlock(player, update); + if (hasUnlock(update)) { + stateManager.saveIfDirty(); + } + if (state.bossBarEnabled() && state.baseLevel() >= 2) { + showProgress(player, warmupDisplay(state)); + } + } + + void removeAllBossBars() { + activeBossBars.values().forEach(BossBar::removeAll); + activeBossBars.clear(); + } + + private ProgressionUpdate updateForMaterial(PlayerState player, Material material) { + return switch (material) { + case GRASS_BLOCK, DIRT -> baseProgressionService.recordGrassOrDirtBreak(player); + case STONE -> secondaryProgressionService.recordStoneBreak(player); + case DEEPSLATE -> secondaryProgressionService.recordDeepslateBreak(player); + case OBSIDIAN -> secondaryProgressionService.recordObsidianBreak(player); + default -> ProgressionUpdate.unchanged(player); + }; + } + + private void announceUnlock(Player player, ProgressionUpdate update) { + if (update.unlockedBaseLevel()) { + int level = update.player().baseLevel(); + String subtitle = switch (level) { + case 1 -> "/setbase is now available"; + case 2 -> "/basenavigation is now available"; + case 3 -> "/base is now available"; + case 4 -> "Visitors can now travel to your base"; + default -> "A new base benefit is available"; + }; + player.sendTitle( + ChatColor.GOLD + "Base " + roman(level) + " Unlocked", + ChatColor.YELLOW + subtitle, + 10, 70, 20 + ); + player.sendMessage(ChatColor.GREEN + "You unlocked Base " + roman(level) + "! " + subtitle); + } + if (update.unlockedSizeLevel()) { + int radius = boundsService.radius(update.player()); + player.sendTitle( + ChatColor.GOLD + "Base Size Upgraded", + ChatColor.YELLOW + "Your base radius is now " + radius + " blocks", + 10, 70, 20 + ); + } + if (update.unlockedWarmupLevel()) { + player.sendTitle( + ChatColor.GOLD + "Teleport Warm-up Improved", + ChatColor.YELLOW + "Your /base warm-up is now shorter", + 10, 70, 20 + ); + } + if (update.unlockedCooldownLevel()) { + player.sendTitle( + ChatColor.GOLD + "Teleport Cooldown Improved", + ChatColor.YELLOW + "You can use /base more often", + 10, 70, 20 + ); + } + } + + private void showProgress(Player player, ProgressDisplay display) { + if (display == null) { + removeBossBar(player.getUniqueId()); + return; + } + removeBossBar(player.getUniqueId()); + BossBar bossBar = Bukkit.createBossBar( + ChatColor.YELLOW + display.label() + ": " + display.count() + "/" + display.threshold(), + BarColor.GREEN, + BarStyle.SOLID + ); + bossBar.setProgress(Math.min(1.0, (double) display.count() / display.threshold())); + bossBar.addPlayer(player); + activeBossBars.put(player.getUniqueId(), bossBar); + Bukkit.getScheduler().runTaskLater(plugin, () -> { + if (activeBossBars.remove(player.getUniqueId(), bossBar)) { + bossBar.removeAll(); + } + }, BOSS_BAR_TICKS); + } + + private ProgressDisplay progressDisplay(PlayerState state, Material material) { + return switch (material) { + case GRASS_BLOCK, DIRT -> state.baseLevel() < 2 + ? new ProgressDisplay( + state.baseLevel() == 0 ? "Base I" : "Base II", + state.grassAndDirtBroken(), + state.baseLevel() == 0 ? settings.baseUnlockBlocks() : settings.navigationUnlockBlocks() + ) + : null; + case STONE -> state.sizeLevel() == 0 + ? new ProgressDisplay("Base Size II", state.stoneBroken(), settings.stoneExpansionBlocks()) + : null; + case DEEPSLATE -> state.sizeLevel() == 1 + ? new ProgressDisplay("Base Size III", state.deepslateBroken(), settings.deepslateExpansionBlocks()) + : null; + case OBSIDIAN -> state.sizeLevel() == 2 + ? new ProgressDisplay("Base Size IV", state.obsidianBroken(), settings.obsidianExpansionBlocks()) + : null; + default -> null; + }; + } + + private ProgressDisplay warmupDisplay(PlayerState state) { + if (state.baseLevel() == 2) { + return new ProgressDisplay( + "Base III", state.blocksPlacedInBase(), settings.teleportUnlockPlacements() + ); + } + return switch (state.warmupLevel()) { + case 0 -> new ProgressDisplay( + "15s Warm-up", state.blocksPlacedInBase(), settings.secondWarmupPlacements() + ); + case 1 -> new ProgressDisplay( + "5s Warm-up", state.blocksPlacedInBase(), settings.thirdWarmupPlacements() + ); + case 2 -> new ProgressDisplay( + "Instant Warm-up", state.blocksPlacedInBase(), settings.instantWarmupPlacements() + ); + default -> null; + }; + } + + private ProgressDisplay cooldownDisplay(PlayerState state) { + return switch (state.cooldownLevel()) { + case 0 -> new ProgressDisplay( + "2h Cooldown", state.blocksBrokenInBase(), settings.firstCooldownBreaks() + ); + case 1 -> new ProgressDisplay( + "1h Cooldown", state.blocksBrokenInBase(), settings.secondCooldownBreaks() + ); + case 2 -> new ProgressDisplay( + "30m Cooldown", state.blocksBrokenInBase(), settings.thirdCooldownBreaks() + ); + case 3 -> new ProgressDisplay( + "Instant Cooldown", state.blocksBrokenInBase(), settings.instantCooldownBreaks() + ); + default -> null; + }; + } + + private boolean isInsideBase(PlayerState state, UUID worldId, int x, int y, int z) { + return state.base().isPresent() && boundsService.area(state).contains(worldId, x, y, z); + } + + private static ProgressionUpdate combine( + ProgressionUpdate first, + ProgressionUpdate second + ) { + return new ProgressionUpdate( + second.player(), + first.unlockedBaseLevel() || second.unlockedBaseLevel(), + first.unlockedSizeLevel() || second.unlockedSizeLevel(), + first.unlockedFlightLevel() || second.unlockedFlightLevel(), + first.unlockedWarmupLevel() || second.unlockedWarmupLevel(), + first.unlockedCooldownLevel() || second.unlockedCooldownLevel() + ); + } + + private static boolean hasUnlock(ProgressionUpdate update) { + return update.unlockedBaseLevel() || update.unlockedSizeLevel() + || update.unlockedFlightLevel() || update.unlockedWarmupLevel() + || update.unlockedCooldownLevel(); + } + + private void removeBossBar(UUID playerId) { + BossBar previous = activeBossBars.remove(playerId); + if (previous != null) { + previous.removeAll(); + } + } + + private static boolean isProgressMaterial(Material material) { + return material == Material.GRASS_BLOCK || material == Material.DIRT + || material == Material.STONE || material == Material.DEEPSLATE + || material == Material.OBSIDIAN; + } + + private static String roman(int level) { + return switch (level) { + case 1 -> "I"; + case 2 -> "II"; + case 3 -> "III"; + case 4 -> "IV"; + default -> Integer.toString(level); + }; + } + + private record ProgressDisplay(String label, long count, long threshold) { + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseProgressionService.java b/src/main/java/games/dmg/spigotbase/BaseProgressionService.java new file mode 100644 index 0000000..94d30cd --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseProgressionService.java @@ -0,0 +1,29 @@ +package games.dmg.spigotbase; + +public final class BaseProgressionService { + private final PluginSettings settings; + + public BaseProgressionService(PluginSettings settings) { + this.settings = settings; + } + + public ProgressionUpdate recordGrassOrDirtBreak(PlayerState player) { + long count = player.grassAndDirtBroken() == Long.MAX_VALUE + ? Long.MAX_VALUE + : player.grassAndDirtBroken() + 1; + int previousLevel = player.baseLevel(); + int baseLevel = previousLevel; + if (previousLevel == 0 && count >= settings.baseUnlockBlocks()) { + baseLevel = 1; + } + if (previousLevel == 1 && count >= settings.navigationUnlockBlocks()) { + baseLevel = 2; + } + boolean unlocked = baseLevel != previousLevel; + PlayerState updated = player.withGrassAndDirtProgress(count, baseLevel); + if (baseLevel >= 2 && !updated.navigationEnabled()) { + updated = updated.withNavigationEnabled(true); + } + return new ProgressionUpdate(updated, unlocked, false, false, false, false); + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseService.java b/src/main/java/games/dmg/spigotbase/BaseService.java new file mode 100644 index 0000000..0cab9d5 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseService.java @@ -0,0 +1,39 @@ +package games.dmg.spigotbase; + +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; + +public final class BaseService { + private final PluginSettings settings; + + public BaseService(PluginSettings settings) { + this.settings = settings; + } + + public boolean canSetBase(PlayerState player, Instant now) { + if (player.baseLevel() < 1) { + return false; + } + return relocationRemaining(player, now).isEmpty(); + } + + public Optional relocationRemaining(PlayerState player, Instant now) { + if (player.baseLevel() < 1 || player.lastBaseSet().isEmpty()) { + return Optional.empty(); + } + Instant availableAt = player.lastBaseSet().orElseThrow() + .plusSeconds(settings.relocationCooldownSeconds()); + if (!now.isBefore(availableAt)) { + return Optional.empty(); + } + return Optional.of(Duration.between(now, availableAt)); + } + + public PlayerState setBase(PlayerState player, BaseLocation location, Instant now) { + if (!canSetBase(player, now)) { + throw new IllegalStateException("base cannot be set yet"); + } + return player.withBase(location, now); + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseStateManager.java b/src/main/java/games/dmg/spigotbase/BaseStateManager.java new file mode 100644 index 0000000..6584505 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseStateManager.java @@ -0,0 +1,96 @@ +package games.dmg.spigotbase; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.function.UnaryOperator; +import java.util.logging.Level; +import java.util.logging.Logger; + +public final class BaseStateManager { + private final YamlBaseStateRepository repository; + private final Logger logger; + private final Map players; + private boolean dirty; + + public BaseStateManager(YamlBaseStateRepository repository, Logger logger) throws IOException { + this.repository = repository; + this.logger = logger; + this.players = new HashMap<>(repository.load().players()); + } + + public PlayerState player(UUID playerId, String latestName) { + PlayerState existing = players.get(playerId); + if (existing == null) { + PlayerState created = PlayerState.newPlayer(playerId, latestName); + players.put(playerId, created); + dirty = true; + return created; + } + if (!existing.latestName().equals(latestName)) { + existing = existing.withLatestName(latestName); + players.put(playerId, existing); + dirty = true; + } + return existing; + } + + public PlayerState update(UUID playerId, String latestName, UnaryOperator operation) { + PlayerState updated = operation.apply(player(playerId, latestName)); + if (!updated.playerId().equals(playerId)) { + throw new IllegalArgumentException("updated player ID cannot change"); + } + players.put(playerId, updated); + dirty = true; + return updated; + } + + public PlayerState updateAndSave( + UUID playerId, + String latestName, + UnaryOperator operation + ) throws IOException { + PlayerState current = players.getOrDefault( + playerId, + PlayerState.newPlayer(playerId, latestName) + ); + if (!current.latestName().equals(latestName)) { + current = current.withLatestName(latestName); + } + PlayerState updated = operation.apply(current); + if (!updated.playerId().equals(playerId)) { + throw new IllegalArgumentException("updated player ID cannot change"); + } + Map proposed = new HashMap<>(players); + proposed.put(playerId, updated); + repository.save(new PersistentState(proposed)); + players.clear(); + players.putAll(proposed); + dirty = false; + return updated; + } + + public Map knownPlayers() { + return Map.copyOf(players); + } + + public Optional findByName(String name) { + return players.values().stream() + .filter(player -> player.latestName().equalsIgnoreCase(name)) + .findFirst(); + } + + public void saveIfDirty() { + if (!dirty) { + return; + } + try { + repository.save(new PersistentState(players)); + dirty = false; + } catch (IOException exception) { + logger.log(Level.SEVERE, "Could not save Spigot Base state", exception); + } + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseTeleportManager.java b/src/main/java/games/dmg/spigotbase/BaseTeleportManager.java new file mode 100644 index 0000000..330115d --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseTeleportManager.java @@ -0,0 +1,298 @@ +package games.dmg.spigotbase; + +import java.time.Clock; +import java.time.Duration; +import java.time.Instant; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.player.PlayerChangedWorldEvent; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerMoveEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.plugin.Plugin; +import org.bukkit.scheduler.BukkitTask; + +final class BaseTeleportManager implements Listener { + private final Plugin plugin; + private final BaseStateManager stateManager; + private final TeleportPolicy policy; + private final VisitorPolicy visitorPolicy; + private final SafeBaseDestination destinationFinder; + private final Clock clock; + private final Map requests = new HashMap<>(); + + BaseTeleportManager( + Plugin plugin, + BaseStateManager stateManager, + TeleportPolicy policy, + VisitorPolicy visitorPolicy, + SafeBaseDestination destinationFinder, + Clock clock + ) { + this.plugin = plugin; + this.stateManager = stateManager; + this.policy = policy; + this.visitorPolicy = visitorPolicy; + this.destinationFinder = destinationFinder; + this.clock = clock; + } + + void start(Player player) { + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (state.baseLevel() < 3 || state.base().isEmpty()) { + player.sendMessage(ChatColor.RED + "Base III teleportation is still locked."); + return; + } + Optional remaining = policy.remainingCooldown(state, clock.instant()); + if (remaining.isPresent()) { + player.sendMessage(ChatColor.RED + "/base is available again in " + + DurationFormatter.friendly(remaining.orElseThrow()) + "."); + return; + } + begin( + player, + state.base().orElseThrow(), + policy.warmup(state), + null, + Duration.ZERO, + "return home" + ); + } + + void startVisit(Player visitor, PlayerState owner) { + if (visitor.getUniqueId().equals(owner.playerId())) { + visitor.sendMessage(ChatColor.RED + "Use /base to visit your own base."); + return; + } + if (owner.baseLevel() < 4 || !owner.visitorsEnabled() || owner.base().isEmpty()) { + visitor.sendMessage(ChatColor.RED + "That base is not accepting visitors."); + return; + } + PlayerState visitorState = stateManager.player(visitor.getUniqueId(), visitor.getName()); + Optional remaining = visitorPolicy.remaining( + visitorState, owner.playerId(), clock.instant() + ); + if (remaining.isPresent()) { + visitor.sendMessage(ChatColor.RED + "You can visit " + owner.latestName() + " again in " + + DurationFormatter.friendly(remaining.orElseThrow()) + "."); + return; + } + begin( + visitor, + owner.base().orElseThrow(), + policy.warmup(owner), + owner.playerId(), + policy.cooldown(owner), + "visit " + owner.latestName() + "'s base" + ); + } + + private void begin( + Player player, + BaseLocation destination, + Duration warmup, + UUID visitorOwnerId, + Duration visitorCooldown, + String purpose + ) { + if (requests.containsKey(player.getUniqueId())) { + player.sendMessage(ChatColor.RED + "A base teleport is already warming up."); + return; + } + Location origin = player.getLocation(); + int seconds = Math.toIntExact(warmup.getSeconds()); + Request request = new Request( + origin.getWorld().getUID(), + origin.getBlockX(), + origin.getBlockY(), + origin.getBlockZ(), + seconds, + destination, + visitorOwnerId, + visitorCooldown + ); + if (seconds == 0) { + complete(player, request); + return; + } + requests.put(player.getUniqueId(), request); + request.task = Bukkit.getScheduler().runTaskTimer(plugin, () -> tick(player, request), 0L, 20L); + player.sendMessage(ChatColor.YELLOW + "Stand still for " + seconds + " seconds to " + purpose + "."); + } + + void cancelAll() { + for (Request request : requests.values()) { + request.cancelTask(); + } + requests.clear(); + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onMove(PlayerMoveEvent event) { + Request request = requests.get(event.getPlayer().getUniqueId()); + Location destination = event.getTo(); + if (request == null || destination == null) { + return; + } + if (!request.worldId.equals(destination.getWorld().getUID()) + || request.x != destination.getBlockX() + || request.y != destination.getBlockY() + || request.z != destination.getBlockZ()) { + cancel(event.getPlayer(), "Base teleport cancelled because you moved."); + } + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onDamage(EntityDamageEvent event) { + Entity entity = event.getEntity(); + if (entity instanceof Player player) { + cancel(player, "Base teleport cancelled because you took damage."); + } + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onTeleport(PlayerTeleportEvent event) { + cancel(event.getPlayer(), "Base teleport cancelled by another teleport."); + } + + @EventHandler + public void onWorldChange(PlayerChangedWorldEvent event) { + cancel(event.getPlayer(), "Base teleport cancelled because you changed worlds."); + } + + @EventHandler + public void onDeath(PlayerDeathEvent event) { + cancel(event.getEntity(), "Base teleport cancelled because you died."); + } + + @EventHandler + public void onQuit(PlayerQuitEvent event) { + cancel(event.getPlayer(), null); + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onCommand(PlayerCommandPreprocessEvent event) { + String command = event.getMessage().toLowerCase(Locale.ROOT).split("\\s+", 2)[0]; + if (command.equals("/base") || command.equals("/gotobase") + || command.equals("/spawn") || command.equals("/home") + || command.equals("/tp") || command.equals("/teleport")) { + cancel(event.getPlayer(), "Base teleport cancelled by another teleport command."); + } + } + + private void tick(Player player, Request request) { + if (!player.isOnline() || requests.get(player.getUniqueId()) != request) { + request.cancelTask(); + return; + } + if (request.remainingSeconds <= 0) { + requests.remove(player.getUniqueId()); + request.cancelTask(); + complete(player, request); + return; + } + player.sendTitle( + ChatColor.GOLD + Integer.toString(request.remainingSeconds), + ChatColor.YELLOW + "Stand still to return to base", + 0, 25, 5 + ); + request.remainingSeconds--; + } + + private void complete(Player player, Request request) { + BaseLocation base = request.destination; + World world = Bukkit.getWorld(base.worldId()); + if (world == null) { + player.sendMessage(ChatColor.RED + "The destination world is not currently available."); + return; + } + Optional destination = destinationFinder.find(world, base); + if (destination.isEmpty()) { + player.sendMessage(ChatColor.RED + "No safe location could be found at the base."); + return; + } + if (!player.teleport(destination.orElseThrow(), PlayerTeleportEvent.TeleportCause.PLUGIN)) { + player.sendMessage(ChatColor.RED + "The base teleport was prevented."); + return; + } + Instant completedAt = clock.instant(); + stateManager.update( + player.getUniqueId(), + player.getName(), + current -> request.visitorOwnerId == null + ? current.withLastBaseTeleport(completedAt) + : current.withVisitorCooldown( + request.visitorOwnerId, + completedAt.plus(request.visitorCooldown) + ) + ); + stateManager.saveIfDirty(); + player.sendMessage(ChatColor.GREEN + (request.visitorOwnerId == null + ? "Welcome home." + : "Welcome to the base.")); + } + + private void cancel(Player player, String message) { + Request request = requests.remove(player.getUniqueId()); + if (request == null) { + return; + } + request.cancelTask(); + if (message != null) { + player.sendMessage(ChatColor.RED + message); + } + } + + private static final class Request { + private final UUID worldId; + private final int x; + private final int y; + private final int z; + private final BaseLocation destination; + private final UUID visitorOwnerId; + private final Duration visitorCooldown; + private int remainingSeconds; + private BukkitTask task; + + private Request( + UUID worldId, + int x, + int y, + int z, + int remainingSeconds, + BaseLocation destination, + UUID visitorOwnerId, + Duration visitorCooldown + ) { + this.worldId = worldId; + this.x = x; + this.y = y; + this.z = z; + this.remainingSeconds = remainingSeconds; + this.destination = destination; + this.visitorOwnerId = visitorOwnerId; + this.visitorCooldown = visitorCooldown; + } + + private void cancelTask() { + if (task != null) { + task.cancel(); + } + } + } +} diff --git a/src/main/java/games/dmg/spigotbase/BaseVisitorsCommand.java b/src/main/java/games/dmg/spigotbase/BaseVisitorsCommand.java new file mode 100644 index 0000000..09765f1 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/BaseVisitorsCommand.java @@ -0,0 +1,38 @@ +package games.dmg.spigotbase; + +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +final class BaseVisitorsCommand implements CommandExecutor { + private final BaseStateManager stateManager; + + BaseVisitorsCommand(BaseStateManager stateManager) { + this.stateManager = stateManager; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!(sender instanceof Player player)) { + sender.sendMessage("Only players can manage base visitors."); + return true; + } + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (state.baseLevel() < 4) { + player.sendMessage(ChatColor.RED + "Base IV visitor access is still locked."); + return true; + } + state = stateManager.update( + player.getUniqueId(), + player.getName(), + current -> current.withVisitorsEnabled(!current.visitorsEnabled()) + ); + stateManager.saveIfDirty(); + player.sendMessage(ChatColor.YELLOW + "Visitor teleports are now " + + (state.visitorsEnabled() ? ChatColor.GREEN + "on" : ChatColor.RED + "off") + + ChatColor.YELLOW + "."); + return true; + } +} diff --git a/src/main/java/games/dmg/spigotbase/DurationFormatter.java b/src/main/java/games/dmg/spigotbase/DurationFormatter.java new file mode 100644 index 0000000..42545b6 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/DurationFormatter.java @@ -0,0 +1,22 @@ +package games.dmg.spigotbase; + +import java.time.Duration; + +final class DurationFormatter { + private DurationFormatter() { + } + + static String friendly(Duration duration) { + long seconds = Math.max(0, duration.getSeconds()); + long hours = seconds / 3_600; + long minutes = seconds % 3_600 / 60; + long remainder = seconds % 60; + if (hours > 0) { + return minutes > 0 ? hours + "h " + minutes + "m" : hours + "h"; + } + if (minutes > 0) { + return remainder > 0 ? minutes + "m " + remainder + "s" : minutes + "m"; + } + return remainder + "s"; + } +} diff --git a/src/main/java/games/dmg/spigotbase/GoToBaseCommand.java b/src/main/java/games/dmg/spigotbase/GoToBaseCommand.java new file mode 100644 index 0000000..5a2dd70 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/GoToBaseCommand.java @@ -0,0 +1,61 @@ +package games.dmg.spigotbase; + +import java.util.Comparator; +import java.util.List; +import java.util.Locale; +import org.bukkit.ChatColor; +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; + +final class GoToBaseCommand implements CommandExecutor, TabCompleter { + private final BaseStateManager stateManager; + private final BaseTeleportManager teleportManager; + + GoToBaseCommand(BaseStateManager stateManager, BaseTeleportManager teleportManager) { + this.stateManager = stateManager; + this.teleportManager = teleportManager; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!(sender instanceof Player player)) { + sender.sendMessage("Only players can visit a base."); + return true; + } + if (arguments.length != 1) { + player.sendMessage(ChatColor.RED + "Usage: /gotobase "); + return true; + } + PlayerState owner = stateManager.findByName(arguments[0]).orElse(null); + if (owner == null || owner.baseLevel() < 4 || !owner.visitorsEnabled() + || owner.base().isEmpty()) { + player.sendMessage(ChatColor.RED + "That player does not have an available base."); + return true; + } + teleportManager.startVisit(player, owner); + return true; + } + + @Override + public List onTabComplete( + CommandSender sender, + Command command, + String alias, + String[] arguments + ) { + if (!(sender instanceof Player player) || arguments.length != 1) { + return List.of(); + } + String prefix = arguments[0].toLowerCase(Locale.ROOT); + return stateManager.knownPlayers().values().stream() + .filter(owner -> !owner.playerId().equals(player.getUniqueId())) + .filter(owner -> owner.baseLevel() >= 4 && owner.visitorsEnabled() && owner.base().isPresent()) + .map(PlayerState::latestName) + .filter(name -> name.toLowerCase(Locale.ROOT).startsWith(prefix)) + .sorted(Comparator.comparing(String::toLowerCase)) + .toList(); + } +} diff --git a/src/main/java/games/dmg/spigotbase/PersistentState.java b/src/main/java/games/dmg/spigotbase/PersistentState.java new file mode 100644 index 0000000..ff458bc --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/PersistentState.java @@ -0,0 +1,14 @@ +package games.dmg.spigotbase; + +import java.util.Map; +import java.util.UUID; + +public record PersistentState(Map players) { + public PersistentState { + players = players == null ? Map.of() : Map.copyOf(players); + } + + public static PersistentState empty() { + return new PersistentState(Map.of()); + } +} diff --git a/src/main/java/games/dmg/spigotbase/PlayerState.java b/src/main/java/games/dmg/spigotbase/PlayerState.java new file mode 100644 index 0000000..5a15988 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/PlayerState.java @@ -0,0 +1,278 @@ +package games.dmg.spigotbase; + +import java.time.Instant; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + +public record PlayerState( + UUID playerId, + String latestName, + Optional base, + int baseLevel, + int sizeLevel, + int flightLevel, + int warmupLevel, + int cooldownLevel, + long grassAndDirtBroken, + long stoneBroken, + long deepslateBroken, + long obsidianBroken, + long blocksPlacedInBase, + long blocksBrokenInBase, + boolean navigationEnabled, + boolean flightEnabled, + boolean bossBarEnabled, + boolean visitorsEnabled, + Optional lastBaseSet, + Optional lastBaseTeleport, + Map visitorCooldownUntil +) { + public PlayerState { + if (playerId == null) { + throw new IllegalArgumentException("player ID is required"); + } + if (latestName == null || latestName.isBlank()) { + throw new IllegalArgumentException("latest player name is required"); + } + base = base == null ? Optional.empty() : base; + lastBaseSet = lastBaseSet == null ? Optional.empty() : lastBaseSet; + lastBaseTeleport = lastBaseTeleport == null ? Optional.empty() : lastBaseTeleport; + visitorCooldownUntil = visitorCooldownUntil == null + ? Map.of() + : Map.copyOf(visitorCooldownUntil); + + requireLevel(baseLevel, 0, 4, "base level"); + requireLevel(sizeLevel, 0, 3, "size level"); + requireLevel(flightLevel, 0, 3, "flight level"); + requireLevel(warmupLevel, 0, 3, "warm-up level"); + requireLevel(cooldownLevel, 0, 4, "cooldown level"); + requireNonNegative(grassAndDirtBroken, "grass and dirt broken"); + requireNonNegative(stoneBroken, "stone broken"); + requireNonNegative(deepslateBroken, "deepslate broken"); + requireNonNegative(obsidianBroken, "obsidian broken"); + requireNonNegative(blocksPlacedInBase, "blocks placed in base"); + requireNonNegative(blocksBrokenInBase, "blocks broken in base"); + + if (baseLevel == 0 && (sizeLevel > 0 || flightLevel > 0)) { + throw new IllegalArgumentException("secondary progression requires Base I"); + } + if (baseLevel < 2 && navigationEnabled) { + throw new IllegalArgumentException("navigation requires Base II"); + } + if (flightLevel == 0 && flightEnabled) { + throw new IllegalArgumentException("enabled flight requires an unlocked flight tier"); + } + if (baseLevel < 3 && (warmupLevel > 0 || cooldownLevel > 0)) { + throw new IllegalArgumentException("teleport upgrades require Base III"); + } + if (baseLevel < 4 && visitorsEnabled) { + throw new IllegalArgumentException("visitor access requires Base IV"); + } + if (visitorCooldownUntil.entrySet().stream().anyMatch(entry -> + entry.getKey() == null || entry.getValue() == null)) { + throw new IllegalArgumentException("visitor cooldowns must be complete"); + } + } + + public static PlayerState newPlayer(UUID playerId, String latestName) { + return new PlayerState( + playerId, + latestName, + Optional.empty(), + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + false, false, true, false, + Optional.empty(), Optional.empty(), Map.of() + ); + } + + public PlayerState withLatestName(String name) { + return new PlayerState( + playerId, name, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withGrassAndDirtProgress(long count, int newBaseLevel) { + return new PlayerState( + playerId, latestName, base, newBaseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, count, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withBossBarEnabled(boolean enabled) { + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, enabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withNavigationEnabled(boolean enabled) { + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + enabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withSizeProgress(long stone, long deepslate, long obsidian, int level) { + return new PlayerState( + playerId, latestName, base, baseLevel, level, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stone, deepslate, + obsidian, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withFlightLevel(int level, boolean enabled) { + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, level, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, enabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withFlightEnabled(boolean enabled) { + return withFlightLevel(flightLevel, enabled); + } + + public PlayerState withTeleportProgress( + long placements, + long breaks, + int newWarmupLevel, + int newCooldownLevel, + int newBaseLevel + ) { + return new PlayerState( + playerId, latestName, base, newBaseLevel, sizeLevel, flightLevel, + newWarmupLevel, newCooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, placements, breaks, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withTeleportLevels(int newWarmupLevel, int newCooldownLevel) { + return withTeleportProgress( + blocksPlacedInBase, blocksBrokenInBase, newWarmupLevel, newCooldownLevel, baseLevel + ); + } + + public PlayerState withLastBaseTeleport(Instant usedAt) { + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, Optional.of(usedAt), visitorCooldownUntil + ); + } + + public PlayerState withBaseLevel(int level) { + return new PlayerState( + playerId, latestName, base, level, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withAdministrativeLevels( + int newBaseLevel, + int newSizeLevel, + int newFlightLevel, + int newWarmupLevel, + int newCooldownLevel, + boolean newNavigationEnabled, + boolean newFlightEnabled, + boolean newVisitorsEnabled + ) { + return new PlayerState( + playerId, latestName, base, newBaseLevel, newSizeLevel, newFlightLevel, + newWarmupLevel, newCooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + newNavigationEnabled, newFlightEnabled, bossBarEnabled, newVisitorsEnabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withVisitorsEnabled(boolean enabled) { + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, enabled, + lastBaseSet, lastBaseTeleport, visitorCooldownUntil + ); + } + + public PlayerState withVisitorCooldown(UUID ownerId, Instant availableAt) { + java.util.HashMap cooldowns = new java.util.HashMap<>(visitorCooldownUntil); + cooldowns.put(ownerId, availableAt); + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, cooldowns + ); + } + + public PlayerState withoutPersonalCooldown() { + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, Optional.empty(), visitorCooldownUntil + ); + } + + public PlayerState withoutVisitorCooldowns() { + return new PlayerState( + playerId, latestName, base, baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + lastBaseSet, lastBaseTeleport, Map.of() + ); + } + + public PlayerState withBase(BaseLocation location, Instant setAt) { + return new PlayerState( + playerId, latestName, Optional.of(location), baseLevel, sizeLevel, flightLevel, + warmupLevel, cooldownLevel, grassAndDirtBroken, stoneBroken, deepslateBroken, + obsidianBroken, blocksPlacedInBase, blocksBrokenInBase, + navigationEnabled, flightEnabled, bossBarEnabled, visitorsEnabled, + Optional.of(setAt), lastBaseTeleport, visitorCooldownUntil + ); + } + + private static void requireLevel(int value, int minimum, int maximum, String name) { + if (value < minimum || value > maximum) { + throw new IllegalArgumentException(name + " must be between " + minimum + " and " + maximum); + } + } + + private static void requireNonNegative(long value, String name) { + if (value < 0) { + throw new IllegalArgumentException(name + " must not be negative"); + } + } +} diff --git a/src/main/java/games/dmg/spigotbase/PluginSettings.java b/src/main/java/games/dmg/spigotbase/PluginSettings.java new file mode 100644 index 0000000..6eba152 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/PluginSettings.java @@ -0,0 +1,210 @@ +package games.dmg.spigotbase; + +import java.util.Map; +import java.util.Objects; + +public record PluginSettings( + int baseUnlockBlocks, + int navigationUnlockBlocks, + int initialRadius, + int initialVerticalRange, + int stoneExpansionBlocks, + int deepslateExpansionBlocks, + int obsidianExpansionBlocks, + int firstExpandedRadius, + int secondExpandedRadius, + int thirdExpandedRadius, + long relocationCooldownSeconds, + int flightWarningBuffer, + int secondFlightVerticalRange, + int teleportUnlockPlacements, + int secondWarmupPlacements, + int thirdWarmupPlacements, + int instantWarmupPlacements, + int initialWarmupSeconds, + int secondWarmupSeconds, + int thirdWarmupSeconds, + int firstCooldownBreaks, + int secondCooldownBreaks, + int thirdCooldownBreaks, + int instantCooldownBreaks, + long initialTeleportCooldownSeconds, + long secondTeleportCooldownSeconds, + long thirdTeleportCooldownSeconds, + long fourthTeleportCooldownSeconds, + int visitorUnlockDiamondCost +) { + private static final int DEFAULT_BASE_UNLOCK_BLOCKS = 250; + private static final int DEFAULT_NAVIGATION_UNLOCK_BLOCKS = 500; + private static final int DEFAULT_INITIAL_RADIUS = 10; + private static final int DEFAULT_INITIAL_VERTICAL_RANGE = 25; + private static final int DEFAULT_STONE_EXPANSION_BLOCKS = 500; + private static final int DEFAULT_DEEPSLATE_EXPANSION_BLOCKS = 1_000; + private static final int DEFAULT_OBSIDIAN_EXPANSION_BLOCKS = 1_000; + private static final int DEFAULT_FIRST_EXPANDED_RADIUS = 25; + private static final int DEFAULT_SECOND_EXPANDED_RADIUS = 75; + private static final int DEFAULT_THIRD_EXPANDED_RADIUS = 150; + private static final long DEFAULT_RELOCATION_COOLDOWN_SECONDS = 86_400L; + private static final int DEFAULT_FLIGHT_WARNING_BUFFER = 5; + private static final int DEFAULT_SECOND_FLIGHT_VERTICAL_RANGE = 100; + private static final int DEFAULT_TELEPORT_UNLOCK_PLACEMENTS = 200; + private static final int DEFAULT_SECOND_WARMUP_PLACEMENTS = 1_000; + private static final int DEFAULT_THIRD_WARMUP_PLACEMENTS = 2_000; + private static final int DEFAULT_INSTANT_WARMUP_PLACEMENTS = 12_000; + private static final int DEFAULT_INITIAL_WARMUP_SECONDS = 30; + private static final int DEFAULT_SECOND_WARMUP_SECONDS = 15; + private static final int DEFAULT_THIRD_WARMUP_SECONDS = 5; + private static final int DEFAULT_FIRST_COOLDOWN_BREAKS = 1_000; + private static final int DEFAULT_SECOND_COOLDOWN_BREAKS = 2_000; + private static final int DEFAULT_THIRD_COOLDOWN_BREAKS = 3_000; + private static final int DEFAULT_INSTANT_COOLDOWN_BREAKS = 5_000; + private static final long DEFAULT_INITIAL_TELEPORT_COOLDOWN_SECONDS = 10_800L; + private static final long DEFAULT_SECOND_TELEPORT_COOLDOWN_SECONDS = 7_200L; + private static final long DEFAULT_THIRD_TELEPORT_COOLDOWN_SECONDS = 3_600L; + private static final long DEFAULT_FOURTH_TELEPORT_COOLDOWN_SECONDS = 1_800L; + private static final int DEFAULT_VISITOR_UNLOCK_DIAMOND_COST = 128; + + public PluginSettings { + requirePositive(baseUnlockBlocks, "base-unlock-blocks"); + requirePositive(navigationUnlockBlocks, "navigation-unlock-blocks"); + if (navigationUnlockBlocks < baseUnlockBlocks) { + throw new IllegalArgumentException( + "navigation-unlock-blocks must be at least base-unlock-blocks" + ); + } + requirePositive(initialRadius, "initial-radius"); + requirePositive(initialVerticalRange, "initial-vertical-range"); + requirePositive(stoneExpansionBlocks, "stone-expansion-blocks"); + requirePositive(deepslateExpansionBlocks, "deepslate-expansion-blocks"); + requirePositive(obsidianExpansionBlocks, "obsidian-expansion-blocks"); + requirePositive(firstExpandedRadius, "first-expanded-radius"); + requirePositive(secondExpandedRadius, "second-expanded-radius"); + requirePositive(thirdExpandedRadius, "third-expanded-radius"); + if (firstExpandedRadius <= initialRadius + || secondExpandedRadius <= firstExpandedRadius + || thirdExpandedRadius <= secondExpandedRadius) { + throw new IllegalArgumentException("expanded radii must increase at each tier"); + } + requireNonNegative(relocationCooldownSeconds, "relocation-cooldown-seconds"); + requireNonNegative(flightWarningBuffer, "flight-warning-buffer"); + if (secondFlightVerticalRange <= initialVerticalRange) { + throw new IllegalArgumentException("second-flight-vertical-range must exceed the initial range"); + } + requirePositive(teleportUnlockPlacements, "teleport-unlock-placements"); + if (secondWarmupPlacements <= teleportUnlockPlacements + || thirdWarmupPlacements <= secondWarmupPlacements + || instantWarmupPlacements <= thirdWarmupPlacements) { + throw new IllegalArgumentException("warm-up placement thresholds must increase"); + } + requirePositive(initialWarmupSeconds, "initial-warmup-seconds"); + requirePositive(secondWarmupSeconds, "second-warmup-seconds"); + requirePositive(thirdWarmupSeconds, "third-warmup-seconds"); + if (secondWarmupSeconds >= initialWarmupSeconds + || thirdWarmupSeconds >= secondWarmupSeconds) { + throw new IllegalArgumentException("warm-up durations must decrease"); + } + if (firstCooldownBreaks <= 0 || secondCooldownBreaks <= firstCooldownBreaks + || thirdCooldownBreaks <= secondCooldownBreaks + || instantCooldownBreaks <= thirdCooldownBreaks) { + throw new IllegalArgumentException("cooldown break thresholds must increase"); + } + requireNonNegative(initialTeleportCooldownSeconds, "initial-teleport-cooldown-seconds"); + requireNonNegative(secondTeleportCooldownSeconds, "second-teleport-cooldown-seconds"); + requireNonNegative(thirdTeleportCooldownSeconds, "third-teleport-cooldown-seconds"); + requireNonNegative(fourthTeleportCooldownSeconds, "fourth-teleport-cooldown-seconds"); + if (secondTeleportCooldownSeconds >= initialTeleportCooldownSeconds + || thirdTeleportCooldownSeconds >= secondTeleportCooldownSeconds + || fourthTeleportCooldownSeconds >= thirdTeleportCooldownSeconds) { + throw new IllegalArgumentException("teleport cooldown durations must decrease"); + } + requirePositive(visitorUnlockDiamondCost, "visitor-unlock-diamond-cost"); + } + + public static PluginSettings from(Map values) { + Objects.requireNonNull(values, "values"); + return new PluginSettings( + integer(values, "base-unlock-blocks", DEFAULT_BASE_UNLOCK_BLOCKS), + integer(values, "navigation-unlock-blocks", DEFAULT_NAVIGATION_UNLOCK_BLOCKS), + integer(values, "initial-radius", DEFAULT_INITIAL_RADIUS), + integer(values, "initial-vertical-range", DEFAULT_INITIAL_VERTICAL_RANGE), + integer(values, "stone-expansion-blocks", DEFAULT_STONE_EXPANSION_BLOCKS), + integer(values, "deepslate-expansion-blocks", DEFAULT_DEEPSLATE_EXPANSION_BLOCKS), + integer(values, "obsidian-expansion-blocks", DEFAULT_OBSIDIAN_EXPANSION_BLOCKS), + integer(values, "first-expanded-radius", DEFAULT_FIRST_EXPANDED_RADIUS), + integer(values, "second-expanded-radius", DEFAULT_SECOND_EXPANDED_RADIUS), + integer(values, "third-expanded-radius", DEFAULT_THIRD_EXPANDED_RADIUS), + longInteger(values, "relocation-cooldown-seconds", DEFAULT_RELOCATION_COOLDOWN_SECONDS), + integer(values, "flight-warning-buffer", DEFAULT_FLIGHT_WARNING_BUFFER), + integer(values, "second-flight-vertical-range", DEFAULT_SECOND_FLIGHT_VERTICAL_RANGE), + integer(values, "teleport-unlock-placements", DEFAULT_TELEPORT_UNLOCK_PLACEMENTS), + integer(values, "second-warmup-placements", DEFAULT_SECOND_WARMUP_PLACEMENTS), + integer(values, "third-warmup-placements", DEFAULT_THIRD_WARMUP_PLACEMENTS), + integer(values, "instant-warmup-placements", DEFAULT_INSTANT_WARMUP_PLACEMENTS), + integer(values, "initial-warmup-seconds", DEFAULT_INITIAL_WARMUP_SECONDS), + integer(values, "second-warmup-seconds", DEFAULT_SECOND_WARMUP_SECONDS), + integer(values, "third-warmup-seconds", DEFAULT_THIRD_WARMUP_SECONDS), + integer(values, "first-cooldown-breaks", DEFAULT_FIRST_COOLDOWN_BREAKS), + integer(values, "second-cooldown-breaks", DEFAULT_SECOND_COOLDOWN_BREAKS), + integer(values, "third-cooldown-breaks", DEFAULT_THIRD_COOLDOWN_BREAKS), + integer(values, "instant-cooldown-breaks", DEFAULT_INSTANT_COOLDOWN_BREAKS), + longInteger( + values, + "initial-teleport-cooldown-seconds", + DEFAULT_INITIAL_TELEPORT_COOLDOWN_SECONDS + ), + longInteger( + values, + "second-teleport-cooldown-seconds", + DEFAULT_SECOND_TELEPORT_COOLDOWN_SECONDS + ), + longInteger( + values, + "third-teleport-cooldown-seconds", + DEFAULT_THIRD_TELEPORT_COOLDOWN_SECONDS + ), + longInteger( + values, + "fourth-teleport-cooldown-seconds", + DEFAULT_FOURTH_TELEPORT_COOLDOWN_SECONDS + ), + integer(values, "visitor-unlock-diamond-cost", DEFAULT_VISITOR_UNLOCK_DIAMOND_COST) + ); + } + + private static int integer(Map values, String key, int defaultValue) { + long value = longInteger(values, key, defaultValue); + if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) { + throw new IllegalArgumentException(key + " must be a 32-bit integer"); + } + return (int) value; + } + + private static long longInteger(Map values, String key, long defaultValue) { + Object value = values.get(key); + if (value == null) { + return defaultValue; + } + if (!(value instanceof Number number)) { + throw new IllegalArgumentException(key + " must be an integer"); + } + if (number instanceof Float || number instanceof Double) { + double decimal = number.doubleValue(); + if (!Double.isFinite(decimal) || decimal != Math.rint(decimal)) { + throw new IllegalArgumentException(key + " must be an integer"); + } + } + return number.longValue(); + } + + private static void requirePositive(long value, String name) { + if (value <= 0) { + throw new IllegalArgumentException(name + " must be positive"); + } + } + + private static void requireNonNegative(long value, String name) { + if (value < 0) { + throw new IllegalArgumentException(name + " must not be negative"); + } + } +} diff --git a/src/main/java/games/dmg/spigotbase/ProgressionPath.java b/src/main/java/games/dmg/spigotbase/ProgressionPath.java new file mode 100644 index 0000000..2112f39 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/ProgressionPath.java @@ -0,0 +1,9 @@ +package games.dmg.spigotbase; + +public enum ProgressionPath { + BASE, + SIZE, + FLIGHT, + WARMUP, + COOLDOWN +} diff --git a/src/main/java/games/dmg/spigotbase/ProgressionUpdate.java b/src/main/java/games/dmg/spigotbase/ProgressionUpdate.java new file mode 100644 index 0000000..3f79227 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/ProgressionUpdate.java @@ -0,0 +1,20 @@ +package games.dmg.spigotbase; + +public record ProgressionUpdate( + PlayerState player, + boolean unlockedBaseLevel, + boolean unlockedSizeLevel, + boolean unlockedFlightLevel, + boolean unlockedWarmupLevel, + boolean unlockedCooldownLevel +) { + public ProgressionUpdate { + if (player == null) { + throw new IllegalArgumentException("player is required"); + } + } + + public static ProgressionUpdate unchanged(PlayerState player) { + return new ProgressionUpdate(player, false, false, false, false, false); + } +} diff --git a/src/main/java/games/dmg/spigotbase/SafeBaseDestination.java b/src/main/java/games/dmg/spigotbase/SafeBaseDestination.java new file mode 100644 index 0000000..28e0296 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/SafeBaseDestination.java @@ -0,0 +1,78 @@ +package games.dmg.spigotbase; + +import java.util.Optional; +import java.util.Set; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.block.Block; + +final class SafeBaseDestination { + private static final int HORIZONTAL_SEARCH_RADIUS = 5; + private static final int VERTICAL_SEARCH_RADIUS = 4; + private static final Set HAZARDS = Set.of( + Material.LAVA, + Material.FIRE, + Material.SOUL_FIRE, + Material.MAGMA_BLOCK, + Material.CACTUS, + Material.CAMPFIRE, + Material.SOUL_CAMPFIRE, + Material.POWDER_SNOW + ); + + Optional find(World world, BaseLocation base) { + for (int radius = 0; radius <= HORIZONTAL_SEARCH_RADIUS; radius++) { + for (int deltaX = -radius; deltaX <= radius; deltaX++) { + for (int deltaZ = -radius; deltaZ <= radius; deltaZ++) { + if (radius > 0 && Math.abs(deltaX) != radius && Math.abs(deltaZ) != radius) { + continue; + } + for (int vertical = 0; vertical <= VERTICAL_SEARCH_RADIUS; vertical++) { + Optional above = candidate( + world, base, deltaX, vertical, deltaZ + ); + if (above.isPresent()) { + return above; + } + if (vertical > 0) { + Optional below = candidate( + world, base, deltaX, -vertical, deltaZ + ); + if (below.isPresent()) { + return below; + } + } + } + } + } + } + return Optional.empty(); + } + + private Optional candidate( + World world, + BaseLocation base, + int deltaX, + int deltaY, + int deltaZ + ) { + int x = base.x() + deltaX; + int y = base.y() + deltaY; + int z = base.z() + deltaZ; + if (y <= world.getMinHeight() || y + 1 >= world.getMaxHeight()) { + return Optional.empty(); + } + Block feet = world.getBlockAt(x, y, z); + Block head = world.getBlockAt(x, y + 1, z); + Block ground = world.getBlockAt(x, y - 1, z); + if (!feet.isPassable() || !head.isPassable() || !ground.getType().isSolid() + || feet.isLiquid() || head.isLiquid() || HAZARDS.contains(ground.getType()) + || HAZARDS.contains(feet.getType()) || HAZARDS.contains(head.getType())) { + return Optional.empty(); + } + return Optional.of(new Location( + world, x + 0.5, y, z + 0.5, base.yaw(), base.pitch() + )); + } +} diff --git a/src/main/java/games/dmg/spigotbase/SecondaryProgressionService.java b/src/main/java/games/dmg/spigotbase/SecondaryProgressionService.java new file mode 100644 index 0000000..b573926 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/SecondaryProgressionService.java @@ -0,0 +1,67 @@ +package games.dmg.spigotbase; + +public final class SecondaryProgressionService { + private final PluginSettings settings; + + public SecondaryProgressionService(PluginSettings settings) { + this.settings = settings; + } + + public ProgressionUpdate recordStoneBreak(PlayerState player) { + if (player.baseLevel() < 1 || player.sizeLevel() != 0) { + return ProgressionUpdate.unchanged(player); + } + long count = increment(player.stoneBroken()); + boolean unlocked = count >= settings.stoneExpansionBlocks(); + return new ProgressionUpdate( + player.withSizeProgress( + count, player.deepslateBroken(), player.obsidianBroken(), unlocked ? 1 : 0 + ), + false, unlocked, false, false, false + ); + } + + public ProgressionUpdate recordDeepslateBreak(PlayerState player) { + if (player.baseLevel() < 1 || player.sizeLevel() != 1) { + return ProgressionUpdate.unchanged(player); + } + long count = increment(player.deepslateBroken()); + boolean unlocked = count >= settings.deepslateExpansionBlocks(); + return new ProgressionUpdate( + player.withSizeProgress( + player.stoneBroken(), count, player.obsidianBroken(), unlocked ? 2 : 1 + ), + false, unlocked, false, false, false + ); + } + + public ProgressionUpdate recordObsidianBreak(PlayerState player) { + if (player.baseLevel() < 1 || player.sizeLevel() != 2) { + return ProgressionUpdate.unchanged(player); + } + long count = increment(player.obsidianBroken()); + boolean unlocked = count >= settings.obsidianExpansionBlocks(); + return new ProgressionUpdate( + player.withSizeProgress( + player.stoneBroken(), player.deepslateBroken(), count, unlocked ? 3 : 2 + ), + false, unlocked, false, false, false + ); + } + + public ProgressionUpdate observeElytraCount(PlayerState player, int elytraCount) { + if (player.baseLevel() < 1 || player.base().isEmpty() + || elytraCount <= player.flightLevel()) { + return ProgressionUpdate.unchanged(player); + } + int level = Math.min(3, Math.max(0, elytraCount)); + return new ProgressionUpdate( + player.withFlightLevel(level, true), + false, false, true, false, false + ); + } + + private static long increment(long value) { + return value == Long.MAX_VALUE ? Long.MAX_VALUE : value + 1; + } +} diff --git a/src/main/java/games/dmg/spigotbase/SetBaseCommand.java b/src/main/java/games/dmg/spigotbase/SetBaseCommand.java new file mode 100644 index 0000000..c9bbf8e --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/SetBaseCommand.java @@ -0,0 +1,61 @@ +package games.dmg.spigotbase; + +import java.time.Clock; +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +final class SetBaseCommand implements CommandExecutor { + private final BaseStateManager stateManager; + private final BaseService baseService; + private final Clock clock; + + SetBaseCommand(BaseStateManager stateManager, BaseService baseService, Clock clock) { + this.stateManager = stateManager; + this.baseService = baseService; + this.clock = clock; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] arguments) { + if (!(sender instanceof Player player)) { + sender.sendMessage("Only players can set a base."); + return true; + } + PlayerState state = stateManager.player(player.getUniqueId(), player.getName()); + if (state.baseLevel() < 1) { + player.sendMessage(ChatColor.RED + "Base I is locked. Break grass blocks or dirt to unlock it."); + return true; + } + Instant now = clock.instant(); + Optional remaining = baseService.relocationRemaining(state, now); + if (remaining.isPresent()) { + player.sendMessage(ChatColor.RED + "You can move your base again in " + + DurationFormatter.friendly(remaining.orElseThrow()) + "."); + return true; + } + Location location = player.getLocation(); + World world = location.getWorld(); + if (world == null) { + player.sendMessage(ChatColor.RED + "Your current world is unavailable."); + return true; + } + BaseLocation base = new BaseLocation( + world.getUID(), world.getName(), location.getBlockX(), location.getBlockY(), + location.getBlockZ(), location.getYaw(), location.getPitch() + ); + stateManager.update( + player.getUniqueId(), player.getName(), current -> baseService.setBase(current, base, now) + ); + stateManager.saveIfDirty(); + player.sendMessage(ChatColor.GREEN + "Base set at " + base.x() + ", " + base.y() + ", " + base.z() + "."); + return true; + } +} diff --git a/src/main/java/games/dmg/spigotbase/SpigotBasePlugin.java b/src/main/java/games/dmg/spigotbase/SpigotBasePlugin.java new file mode 100644 index 0000000..eede6a1 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/SpigotBasePlugin.java @@ -0,0 +1,114 @@ +package games.dmg.spigotbase; + +import java.io.IOException; +import java.time.Clock; +import java.util.Map; +import java.util.Objects; +import java.util.logging.Level; +import org.bukkit.command.PluginCommand; +import org.bukkit.plugin.java.JavaPlugin; + +public final class SpigotBasePlugin extends JavaPlugin { + private PluginSettings settings; + private BaseStateManager stateManager; + private BaseProgressListener progressListener; + private BaseFlightController flightController; + private BaseTeleportManager teleportManager; + + @Override + public void onEnable() { + saveDefaultConfig(); + try { + Map values = getConfig().getValues(false); + settings = PluginSettings.from(values); + stateManager = new BaseStateManager( + new YamlBaseStateRepository(getDataFolder().toPath().resolve("state.yml")), + getLogger() + ); + } catch (IllegalArgumentException | IOException exception) { + getLogger().log(Level.SEVERE, "Could not initialize Spigot Base", exception); + getServer().getPluginManager().disablePlugin(this); + return; + } + + BaseService baseService = new BaseService(settings); + BaseProgressionService progressionService = new BaseProgressionService(settings); + SecondaryProgressionService secondaryProgressionService = + new SecondaryProgressionService(settings); + TeleportProgressionService teleportProgressionService = + new TeleportProgressionService(settings); + BaseBoundsService boundsService = new BaseBoundsService(settings); + progressListener = new BaseProgressListener( + this, + stateManager, + progressionService, + secondaryProgressionService, + teleportProgressionService, + boundsService, + settings + ); + flightController = new BaseFlightController( + getServer(), stateManager, secondaryProgressionService, boundsService, settings + ); + VisitorPolicy visitorPolicy = new VisitorPolicy(); + teleportManager = new BaseTeleportManager( + this, + stateManager, + new TeleportPolicy(settings), + visitorPolicy, + new SafeBaseDestination(), + Clock.systemUTC() + ); + getServer().getPluginManager().registerEvents(progressListener, this); + getServer().getPluginManager().registerEvents(teleportManager, this); + + command("setbase").setExecutor(new SetBaseCommand(stateManager, baseService, Clock.systemUTC())); + command("base").setExecutor( + new BaseCommand(teleportManager, stateManager, visitorPolicy, settings) + ); + command("baseprogress").setExecutor(new BaseProgressCommand(stateManager, settings)); + command("basenavigation").setExecutor(new BaseNavigationCommand(stateManager)); + command("baseflight").setExecutor(new BaseFlightCommand(stateManager, flightController)); + command("basevisitors").setExecutor(new BaseVisitorsCommand(stateManager)); + GoToBaseCommand goToBaseCommand = new GoToBaseCommand(stateManager, teleportManager); + command("gotobase").setExecutor(goToBaseCommand); + command("gotobase").setTabCompleter(goToBaseCommand); + command("baseadmin").setExecutor( + new BaseAdminCommand(stateManager, new AdminProgressionService()) + ); + + getServer().getScheduler().runTaskTimer( + this, new BaseNavigationController(getServer(), stateManager), 10L, 10L + ); + getServer().getScheduler().runTaskTimer(this, flightController, 5L, 5L); + getServer().getScheduler().runTaskTimer(this, stateManager::saveIfDirty, 600L, 600L); + getLogger().info("Spigot Base enabled."); + } + + @Override + public void onDisable() { + if (progressListener != null) { + progressListener.removeAllBossBars(); + } + if (flightController != null) { + flightController.removeAllGrantedFlight(); + } + if (teleportManager != null) { + teleportManager.cancelAll(); + } + if (stateManager != null) { + stateManager.saveIfDirty(); + } + } + + PluginSettings settings() { + if (settings == null) { + throw new IllegalStateException("Plugin settings are unavailable"); + } + return settings; + } + + private PluginCommand command(String name) { + return Objects.requireNonNull(getCommand(name), "Missing command metadata for " + name); + } +} diff --git a/src/main/java/games/dmg/spigotbase/TeleportPolicy.java b/src/main/java/games/dmg/spigotbase/TeleportPolicy.java new file mode 100644 index 0000000..9c54d19 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/TeleportPolicy.java @@ -0,0 +1,45 @@ +package games.dmg.spigotbase; + +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; + +public final class TeleportPolicy { + private final PluginSettings settings; + + public TeleportPolicy(PluginSettings settings) { + this.settings = settings; + } + + public Duration warmup(PlayerState player) { + return switch (player.warmupLevel()) { + case 0 -> Duration.ofSeconds(settings.initialWarmupSeconds()); + case 1 -> Duration.ofSeconds(settings.secondWarmupSeconds()); + case 2 -> Duration.ofSeconds(settings.thirdWarmupSeconds()); + case 3 -> Duration.ZERO; + default -> throw new IllegalArgumentException("unknown warm-up level"); + }; + } + + public Duration cooldown(PlayerState player) { + return switch (player.cooldownLevel()) { + case 0 -> Duration.ofSeconds(settings.initialTeleportCooldownSeconds()); + case 1 -> Duration.ofSeconds(settings.secondTeleportCooldownSeconds()); + case 2 -> Duration.ofSeconds(settings.thirdTeleportCooldownSeconds()); + case 3 -> Duration.ofSeconds(settings.fourthTeleportCooldownSeconds()); + case 4 -> Duration.ZERO; + default -> throw new IllegalArgumentException("unknown cooldown level"); + }; + } + + public Optional remainingCooldown(PlayerState player, Instant now) { + if (player.lastBaseTeleport().isEmpty()) { + return Optional.empty(); + } + Instant availableAt = player.lastBaseTeleport().orElseThrow().plus(cooldown(player)); + if (!now.isBefore(availableAt)) { + return Optional.empty(); + } + return Optional.of(Duration.between(now, availableAt)); + } +} diff --git a/src/main/java/games/dmg/spigotbase/TeleportProgressionService.java b/src/main/java/games/dmg/spigotbase/TeleportProgressionService.java new file mode 100644 index 0000000..b8e546a --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/TeleportProgressionService.java @@ -0,0 +1,90 @@ +package games.dmg.spigotbase; + +public final class TeleportProgressionService { + private final PluginSettings settings; + + public TeleportProgressionService(PluginSettings settings) { + this.settings = settings; + } + + public ProgressionUpdate recordPlacement(PlayerState player) { + if (player.baseLevel() < 2 || player.base().isEmpty()) { + return ProgressionUpdate.unchanged(player); + } + long placements = increment(player.blocksPlacedInBase()); + int baseLevel = player.baseLevel(); + if (baseLevel == 2 && placements >= settings.teleportUnlockPlacements()) { + baseLevel = 3; + } + int warmupLevel = baseLevel >= 3 ? warmupLevel(placements) : 0; + return new ProgressionUpdate( + player.withTeleportProgress( + placements, + player.blocksBrokenInBase(), + warmupLevel, + player.cooldownLevel(), + baseLevel + ), + baseLevel > player.baseLevel(), + false, + false, + warmupLevel > player.warmupLevel(), + false + ); + } + + public ProgressionUpdate recordBreak(PlayerState player) { + if (player.baseLevel() < 3 || player.base().isEmpty()) { + return ProgressionUpdate.unchanged(player); + } + long breaks = increment(player.blocksBrokenInBase()); + int cooldownLevel = cooldownLevel(breaks); + return new ProgressionUpdate( + player.withTeleportProgress( + player.blocksPlacedInBase(), + breaks, + player.warmupLevel(), + cooldownLevel, + player.baseLevel() + ), + false, + false, + false, + false, + cooldownLevel > player.cooldownLevel() + ); + } + + private int warmupLevel(long placements) { + if (placements >= settings.instantWarmupPlacements()) { + return 3; + } + if (placements >= settings.thirdWarmupPlacements()) { + return 2; + } + if (placements >= settings.secondWarmupPlacements()) { + return 1; + } + return 0; + } + + private int cooldownLevel(long breaks) { + if (breaks >= settings.instantCooldownBreaks()) { + return 4; + } + if (breaks >= settings.thirdCooldownBreaks()) { + return 3; + } + if (breaks >= settings.secondCooldownBreaks()) { + return 2; + } + if (breaks >= settings.firstCooldownBreaks()) { + return 1; + } + return 0; + } + + private static long increment(long value) { + return value == Long.MAX_VALUE ? Long.MAX_VALUE : value + 1; + } +} diff --git a/src/main/java/games/dmg/spigotbase/VisitorPolicy.java b/src/main/java/games/dmg/spigotbase/VisitorPolicy.java new file mode 100644 index 0000000..9891ffd --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/VisitorPolicy.java @@ -0,0 +1,20 @@ +package games.dmg.spigotbase; + +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; +import java.util.UUID; + +public final class VisitorPolicy { + public boolean canPurchase(PlayerState owner) { + return owner.baseLevel() == 3 && owner.base().isPresent(); + } + + public Optional remaining(PlayerState visitor, UUID ownerId, Instant now) { + Instant availableAt = visitor.visitorCooldownUntil().get(ownerId); + if (availableAt == null || !now.isBefore(availableAt)) { + return Optional.empty(); + } + return Optional.of(Duration.between(now, availableAt)); + } +} diff --git a/src/main/java/games/dmg/spigotbase/YamlBaseStateRepository.java b/src/main/java/games/dmg/spigotbase/YamlBaseStateRepository.java new file mode 100644 index 0000000..1d8a155 --- /dev/null +++ b/src/main/java/games/dmg/spigotbase/YamlBaseStateRepository.java @@ -0,0 +1,218 @@ +package games.dmg.spigotbase; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.time.Instant; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; + +public final class YamlBaseStateRepository { + private final Path stateFile; + + public YamlBaseStateRepository(Path stateFile) { + this.stateFile = stateFile; + } + + public PersistentState load() throws IOException { + if (!Files.exists(stateFile)) { + return PersistentState.empty(); + } + YamlConfiguration yaml = new YamlConfiguration(); + try { + yaml.load(stateFile.toFile()); + } catch (InvalidConfigurationException exception) { + throw new IOException("state file is not valid YAML", exception); + } + return new PersistentState(loadPlayers(yaml)); + } + + public void save(PersistentState state) throws IOException { + Path parent = stateFile.toAbsolutePath().getParent(); + if (parent != null) { + Files.createDirectories(parent); + } + YamlConfiguration yaml = new YamlConfiguration(); + savePlayers(yaml, state.players()); + + Path temporary = Files.createTempFile(parent, "spigot-base-state-", ".yml"); + try { + yaml.save(temporary.toFile()); + try { + Files.move( + temporary, + stateFile, + StandardCopyOption.REPLACE_EXISTING, + StandardCopyOption.ATOMIC_MOVE + ); + } catch (IOException atomicMoveFailure) { + Files.move(temporary, stateFile, StandardCopyOption.REPLACE_EXISTING); + } + } finally { + Files.deleteIfExists(temporary); + } + } + + private static Map loadPlayers(YamlConfiguration yaml) { + Map players = new HashMap<>(); + ConfigurationSection section = yaml.getConfigurationSection("players"); + if (section == null) { + return players; + } + for (String key : section.getKeys(false)) { + try { + UUID playerId = UUID.fromString(key); + String path = "players." + key; + String name = yaml.getString(path + ".name"); + if (name == null || name.isBlank()) { + continue; + } + PlayerState player = new PlayerState( + playerId, + name, + loadBase(yaml, path + ".base"), + level(yaml, path + ".base-level"), + level(yaml, path + ".size-level"), + level(yaml, path + ".flight-level"), + level(yaml, path + ".warmup-level"), + level(yaml, path + ".cooldown-level"), + count(yaml, path + ".grass-and-dirt-broken"), + count(yaml, path + ".stone-broken"), + count(yaml, path + ".deepslate-broken"), + count(yaml, path + ".obsidian-broken"), + count(yaml, path + ".blocks-placed-in-base"), + count(yaml, path + ".blocks-broken-in-base"), + yaml.getBoolean(path + ".navigation-enabled", false), + yaml.getBoolean(path + ".flight-enabled", false), + yaml.getBoolean(path + ".boss-bar-enabled", true), + yaml.getBoolean(path + ".visitors-enabled", false), + instant(yaml, path + ".last-base-set-epoch-millis"), + instant(yaml, path + ".last-base-teleport-epoch-millis"), + loadVisitorCooldowns(yaml, path + ".visitor-cooldowns") + ); + players.put(playerId, player); + } catch (IllegalArgumentException ignored) { + // Invalid records are ignored rather than granting progression. + } + } + return players; + } + + private static Optional loadBase(YamlConfiguration yaml, String path) { + if (!yaml.isConfigurationSection(path)) { + return Optional.empty(); + } + String worldId = yaml.getString(path + ".world-id"); + String worldName = yaml.getString(path + ".world-name"); + if (worldId == null || worldName == null + || !yaml.isInt(path + ".x") || !yaml.isInt(path + ".y") || !yaml.isInt(path + ".z") + || !yaml.isDouble(path + ".yaw") || !yaml.isDouble(path + ".pitch")) { + throw new IllegalArgumentException("invalid base location"); + } + return Optional.of(new BaseLocation( + UUID.fromString(worldId), + worldName, + yaml.getInt(path + ".x"), + yaml.getInt(path + ".y"), + yaml.getInt(path + ".z"), + (float) yaml.getDouble(path + ".yaw"), + (float) yaml.getDouble(path + ".pitch") + )); + } + + private static Map loadVisitorCooldowns(YamlConfiguration yaml, String path) { + Map cooldowns = new HashMap<>(); + ConfigurationSection section = yaml.getConfigurationSection(path); + if (section == null) { + return cooldowns; + } + for (String key : section.getKeys(false)) { + try { + if (yaml.isLong(path + "." + key)) { + long millis = yaml.getLong(path + "." + key); + if (millis >= 0) { + cooldowns.put(UUID.fromString(key), Instant.ofEpochMilli(millis)); + } + } + } catch (IllegalArgumentException ignored) { + // Invalid destination cooldowns grant no state. + } + } + return cooldowns; + } + + private static int level(YamlConfiguration yaml, String path) { + if (!yaml.isInt(path)) { + return 0; + } + return yaml.getInt(path); + } + + private static long count(YamlConfiguration yaml, String path) { + if (!yaml.isLong(path) && !yaml.isInt(path)) { + return 0; + } + return yaml.getLong(path); + } + + private static Optional instant(YamlConfiguration yaml, String path) { + if (!yaml.isLong(path) && !yaml.isInt(path)) { + return Optional.empty(); + } + long millis = yaml.getLong(path); + return millis < 0 ? Optional.empty() : Optional.of(Instant.ofEpochMilli(millis)); + } + + private static void savePlayers(YamlConfiguration yaml, Map players) { + for (PlayerState player : players.values()) { + String path = "players." + player.playerId(); + yaml.set(path + ".name", player.latestName()); + player.base().ifPresent(base -> saveBase(yaml, path + ".base", base)); + yaml.set(path + ".base-level", player.baseLevel()); + yaml.set(path + ".size-level", player.sizeLevel()); + yaml.set(path + ".flight-level", player.flightLevel()); + yaml.set(path + ".warmup-level", player.warmupLevel()); + yaml.set(path + ".cooldown-level", player.cooldownLevel()); + yaml.set(path + ".grass-and-dirt-broken", player.grassAndDirtBroken()); + yaml.set(path + ".stone-broken", player.stoneBroken()); + yaml.set(path + ".deepslate-broken", player.deepslateBroken()); + yaml.set(path + ".obsidian-broken", player.obsidianBroken()); + yaml.set(path + ".blocks-placed-in-base", player.blocksPlacedInBase()); + yaml.set(path + ".blocks-broken-in-base", player.blocksBrokenInBase()); + yaml.set(path + ".navigation-enabled", player.navigationEnabled()); + yaml.set(path + ".flight-enabled", player.flightEnabled()); + yaml.set(path + ".boss-bar-enabled", player.bossBarEnabled()); + yaml.set(path + ".visitors-enabled", player.visitorsEnabled()); + yaml.set( + path + ".last-base-set-epoch-millis", + player.lastBaseSet().map(Instant::toEpochMilli).orElse(null) + ); + yaml.set( + path + ".last-base-teleport-epoch-millis", + player.lastBaseTeleport().map(Instant::toEpochMilli).orElse(null) + ); + for (Map.Entry cooldown : player.visitorCooldownUntil().entrySet()) { + yaml.set( + path + ".visitor-cooldowns." + cooldown.getKey(), + cooldown.getValue().toEpochMilli() + ); + } + } + } + + private static void saveBase(YamlConfiguration yaml, String path, BaseLocation base) { + yaml.set(path + ".world-id", base.worldId().toString()); + yaml.set(path + ".world-name", base.worldName()); + yaml.set(path + ".x", base.x()); + yaml.set(path + ".y", base.y()); + yaml.set(path + ".z", base.z()); + yaml.set(path + ".yaw", base.yaw()); + yaml.set(path + ".pitch", base.pitch()); + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..0ebf0ed --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,40 @@ +# Core Base progression +base-unlock-blocks: 250 +navigation-unlock-blocks: 500 +initial-radius: 10 +initial-vertical-range: 25 +relocation-cooldown-seconds: 86400 + +# Base size +stone-expansion-blocks: 500 +deepslate-expansion-blocks: 1000 +obsidian-expansion-blocks: 1000 +first-expanded-radius: 25 +second-expanded-radius: 75 +third-expanded-radius: 150 + +# Flight +flight-warning-buffer: 5 +second-flight-vertical-range: 100 + +# Base III teleportation and warm-up progression +teleport-unlock-placements: 200 +second-warmup-placements: 1000 +third-warmup-placements: 2000 +instant-warmup-placements: 12000 +initial-warmup-seconds: 30 +second-warmup-seconds: 15 +third-warmup-seconds: 5 + +# Teleport cooldown progression +first-cooldown-breaks: 1000 +second-cooldown-breaks: 2000 +third-cooldown-breaks: 3000 +instant-cooldown-breaks: 5000 +initial-teleport-cooldown-seconds: 10800 +second-teleport-cooldown-seconds: 7200 +third-teleport-cooldown-seconds: 3600 +fourth-teleport-cooldown-seconds: 1800 + +# Base IV +visitor-unlock-diamond-cost: 128 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..1d8ffbb --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,36 @@ +name: SpigotBase +version: ${version} +main: games.dmg.spigotbase.SpigotBasePlugin +api-version: "1.20" +description: Progression-gated player bases and quality-of-life unlocks. +author: dmg.games +commands: + setbase: + description: Set your unlocked personal base. + usage: /setbase + base: + description: Teleport to or upgrade your base. + usage: /base [upgrade] + basenavigation: + description: Toggle particle navigation toward your base. + usage: /basenavigation + baseflight: + description: Toggle flight within your base. + usage: /baseflight + basevisitors: + description: Toggle visitor access to your base. + usage: /basevisitors + gotobase: + description: Visit an available player base. + usage: /gotobase + baseprogress: + description: View progression or toggle progress boss bars. + usage: /baseprogress [bossbar] + baseadmin: + description: Administer Spigot Base. + usage: /baseadmin + permission: spigotbase.admin +permissions: + spigotbase.admin: + description: Allows administration of Spigot Base. + default: op diff --git a/src/test/java/games/dmg/spigotbase/AdminProgressionServiceTest.java b/src/test/java/games/dmg/spigotbase/AdminProgressionServiceTest.java new file mode 100644 index 0000000..c2188c9 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/AdminProgressionServiceTest.java @@ -0,0 +1,48 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class AdminProgressionServiceTest { + private final AdminProgressionService service = new AdminProgressionService(); + + @Test + void settingTeleportUpgradeGrantsBasePrerequisites() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex"); + + PlayerState updated = service.setLevel(player, ProgressionPath.WARMUP, 2); + + assertEquals(3, updated.baseLevel()); + assertEquals(2, updated.warmupLevel()); + } + + @Test + void loweringBaseRemovesDependentBenefits() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withAdministrativeLevels(4, 3, 3, 3, 4, true, true, true); + + PlayerState updated = service.setLevel(player, ProgressionPath.BASE, 0); + + assertEquals(0, updated.sizeLevel()); + assertEquals(0, updated.flightLevel()); + assertEquals(0, updated.warmupLevel()); + assertEquals(0, updated.cooldownLevel()); + assertFalse(updated.navigationEnabled()); + assertFalse(updated.flightEnabled()); + assertFalse(updated.visitorsEnabled()); + } + + @Test + void rejectsUnknownLevel() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex"); + + assertThrows( + IllegalArgumentException.class, + () -> service.setLevel(player, ProgressionPath.FLIGHT, 4) + ); + } +} diff --git a/src/test/java/games/dmg/spigotbase/BaseAreaTest.java b/src/test/java/games/dmg/spigotbase/BaseAreaTest.java new file mode 100644 index 0000000..c2bc9a9 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/BaseAreaTest.java @@ -0,0 +1,25 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class BaseAreaTest { + @Test + void usesCircularHorizontalAndSymmetricVerticalBounds() { + UUID worldId = UUID.randomUUID(); + BaseArea area = new BaseArea( + new BaseLocation(worldId, "world", 0, 64, 0, 0, 0), + 10, + 25 + ); + + assertTrue(area.contains(worldId, 6, 89, 8)); + assertTrue(area.contains(worldId, 6, 39, 8)); + assertFalse(area.contains(worldId, 10, 64, 10)); + assertFalse(area.contains(worldId, 0, 90, 0)); + assertFalse(area.contains(UUID.randomUUID(), 0, 64, 0)); + } +} diff --git a/src/test/java/games/dmg/spigotbase/BaseBoundsServiceTest.java b/src/test/java/games/dmg/spigotbase/BaseBoundsServiceTest.java new file mode 100644 index 0000000..fe5a094 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/BaseBoundsServiceTest.java @@ -0,0 +1,33 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Map; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class BaseBoundsServiceTest { + private final BaseBoundsService service = new BaseBoundsService(PluginSettings.from(Map.of())); + + @Test + void sizeTiersSelectConfiguredRadius() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(250, 1); + + assertEquals(10, service.radius(player)); + assertEquals(25, service.radius(player.withSizeProgress(500, 0, 0, 1))); + assertEquals(75, service.radius(player.withSizeProgress(500, 1_000, 0, 2))); + assertEquals(150, service.radius(player.withSizeProgress(500, 1_000, 1_000, 3))); + } + + @Test + void flightTiersSelectSymmetricVerticalRange() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(250, 1); + + assertEquals(25, service.verticalRange(player)); + assertEquals(25, service.verticalRange(player.withFlightLevel(1, true))); + assertEquals(100, service.verticalRange(player.withFlightLevel(2, true))); + assertEquals(Integer.MAX_VALUE, service.verticalRange(player.withFlightLevel(3, true))); + } +} diff --git a/src/test/java/games/dmg/spigotbase/BaseNavigationProgressionTest.java b/src/test/java/games/dmg/spigotbase/BaseNavigationProgressionTest.java new file mode 100644 index 0000000..50a65c6 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/BaseNavigationProgressionTest.java @@ -0,0 +1,24 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Map; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class BaseNavigationProgressionTest { + @Test + void fiveHundredthGrassOrDirtBlockUnlocksBaseII() { + BaseProgressionService service = + new BaseProgressionService(PluginSettings.from(Map.of())); + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(499, 1); + + ProgressionUpdate update = service.recordGrassOrDirtBreak(player); + + assertEquals(2, update.player().baseLevel()); + assertTrue(update.player().navigationEnabled()); + assertTrue(update.unlockedBaseLevel()); + } +} diff --git a/src/test/java/games/dmg/spigotbase/BaseProgressionServiceTest.java b/src/test/java/games/dmg/spigotbase/BaseProgressionServiceTest.java new file mode 100644 index 0000000..5d33088 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/BaseProgressionServiceTest.java @@ -0,0 +1,38 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class BaseProgressionServiceTest { + private final PluginSettings settings = PluginSettings.from(java.util.Map.of()); + private final BaseProgressionService service = new BaseProgressionService(settings); + + @Test + void qualifyingBreakIncrementsProgress() { + PlayerState initial = PlayerState.newPlayer(UUID.randomUUID(), "Alex"); + + ProgressionUpdate update = service.recordGrassOrDirtBreak(initial); + + assertEquals(1, update.player().grassAndDirtBroken()); + assertEquals(0, update.player().baseLevel()); + assertFalse(update.unlockedBaseLevel()); + } + + @Test + void thresholdUnlocksBaseIExactlyOnce() { + PlayerState initial = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(249, 0); + + ProgressionUpdate unlocked = service.recordGrassOrDirtBreak(initial); + ProgressionUpdate later = service.recordGrassOrDirtBreak(unlocked.player()); + + assertEquals(1, unlocked.player().baseLevel()); + assertTrue(unlocked.unlockedBaseLevel()); + assertEquals(1, later.player().baseLevel()); + assertFalse(later.unlockedBaseLevel()); + } +} diff --git a/src/test/java/games/dmg/spigotbase/BaseServiceTest.java b/src/test/java/games/dmg/spigotbase/BaseServiceTest.java new file mode 100644 index 0000000..8d08e29 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/BaseServiceTest.java @@ -0,0 +1,51 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.Duration; +import java.time.Instant; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class BaseServiceTest { + private final PluginSettings settings = PluginSettings.from(Map.of()); + private final BaseService service = new BaseService(settings); + + @Test + void firstBaseCanBeSetImmediately() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(250, 1); + + assertTrue(service.canSetBase(player, Instant.EPOCH)); + } + + @Test + void relocationUsesElapsedTwentyFourHours() { + Instant firstSet = Instant.parse("2026-08-09T12:00:00Z"); + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(250, 1) + .withBase( + new BaseLocation(UUID.randomUUID(), "world", 0, 64, 0, 0, 0), + firstSet + ); + + assertFalse(service.canSetBase(player, firstSet.plus(Duration.ofHours(23)))); + assertEquals( + Duration.ofHours(1), + service.relocationRemaining(player, firstSet.plus(Duration.ofHours(23))).orElseThrow() + ); + assertTrue(service.canSetBase(player, firstSet.plus(Duration.ofHours(24)))); + } + + @Test + void lockedPlayerCannotSetBase() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex"); + + assertFalse(service.canSetBase(player, Instant.EPOCH)); + assertEquals(Optional.empty(), service.relocationRemaining(player, Instant.EPOCH)); + } +} diff --git a/src/test/java/games/dmg/spigotbase/BaseStateManagerTest.java b/src/test/java/games/dmg/spigotbase/BaseStateManagerTest.java new file mode 100644 index 0000000..01f14b3 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/BaseStateManagerTest.java @@ -0,0 +1,32 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.nio.file.Path; +import java.util.UUID; +import java.util.logging.Logger; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +final class BaseStateManagerTest { + @TempDir + Path temporaryDirectory; + + @Test + void durableUpdateIsImmediatelyReadableFromRepository() throws Exception { + Path stateFile = temporaryDirectory.resolve("state.yml"); + BaseStateManager manager = new BaseStateManager( + new YamlBaseStateRepository(stateFile), Logger.getAnonymousLogger() + ); + UUID playerId = UUID.randomUUID(); + + manager.updateAndSave( + playerId, + "Alex", + player -> player.withGrassAndDirtProgress(250, 1) + ); + + PlayerState loaded = new YamlBaseStateRepository(stateFile).load().players().get(playerId); + assertEquals(1, loaded.baseLevel()); + } +} diff --git a/src/test/java/games/dmg/spigotbase/PlayerStateTest.java b/src/test/java/games/dmg/spigotbase/PlayerStateTest.java new file mode 100644 index 0000000..7486f01 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/PlayerStateTest.java @@ -0,0 +1,32 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class PlayerStateTest { + @Test + void rejectsLevelsOutsideKnownRanges() { + UUID playerId = UUID.randomUUID(); + + assertThrows(IllegalArgumentException.class, () -> new PlayerState( + playerId, "Alex", Optional.empty(), 5, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + false, false, true, false, Optional.empty(), Optional.empty(), Map.of() + )); + } + + @Test + void rejectsBenefitsWhosePrerequisitesAreMissing() { + UUID playerId = UUID.randomUUID(); + + assertThrows(IllegalArgumentException.class, () -> new PlayerState( + playerId, "Alex", Optional.empty(), 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + false, false, true, false, Optional.empty(), Optional.empty(), Map.of() + )); + } +} diff --git a/src/test/java/games/dmg/spigotbase/PluginMetadataTest.java b/src/test/java/games/dmg/spigotbase/PluginMetadataTest.java new file mode 100644 index 0000000..269c4eb --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/PluginMetadataTest.java @@ -0,0 +1,33 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.InputStream; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.yaml.snakeyaml.Yaml; + +final class PluginMetadataTest { + @Test + void declaresPluginEntrypointCommandsAndPermissions() { + InputStream stream = getClass().getClassLoader().getResourceAsStream("plugin.yml"); + assertNotNull(stream); + + Map plugin = new Yaml().load(stream); + assertEquals("SpigotBase", plugin.get("name")); + assertEquals("games.dmg.spigotbase.SpigotBasePlugin", plugin.get("main")); + assertEquals("1.20", plugin.get("api-version")); + + Map commands = (Map) plugin.get("commands"); + for (String command : new String[] { + "setbase", "base", "basenavigation", "baseflight", + "basevisitors", "gotobase", "baseprogress", "baseadmin" + }) { + assertNotNull(commands.get(command), command); + } + + Map permissions = (Map) plugin.get("permissions"); + assertNotNull(permissions.get("spigotbase.admin")); + } +} diff --git a/src/test/java/games/dmg/spigotbase/PluginSettingsTest.java b/src/test/java/games/dmg/spigotbase/PluginSettingsTest.java new file mode 100644 index 0000000..36583db --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/PluginSettingsTest.java @@ -0,0 +1,42 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.Map; +import org.junit.jupiter.api.Test; + +final class PluginSettingsTest { + @Test + void defaultsMatchApprovedProgression() { + PluginSettings settings = PluginSettings.from(Map.of()); + + assertEquals(250, settings.baseUnlockBlocks()); + assertEquals(500, settings.navigationUnlockBlocks()); + assertEquals(10, settings.initialRadius()); + assertEquals(25, settings.initialVerticalRange()); + assertEquals(86_400L, settings.relocationCooldownSeconds()); + assertEquals(5, settings.flightWarningBuffer()); + assertEquals(200, settings.teleportUnlockPlacements()); + assertEquals(10_800L, settings.initialTeleportCooldownSeconds()); + assertEquals(128, settings.visitorUnlockDiamondCost()); + } + + @Test + void rejectsNavigationThresholdBeforeBaseThreshold() { + Map values = Map.of( + "base-unlock-blocks", 500, + "navigation-unlock-blocks", 250 + ); + + assertThrows(IllegalArgumentException.class, () -> PluginSettings.from(values)); + } + + @Test + void rejectsNegativeDurationsAndDistances() { + assertThrows(IllegalArgumentException.class, + () -> PluginSettings.from(Map.of("relocation-cooldown-seconds", -1))); + assertThrows(IllegalArgumentException.class, + () -> PluginSettings.from(Map.of("initial-radius", 0))); + } +} diff --git a/src/test/java/games/dmg/spigotbase/SecondaryProgressionServiceTest.java b/src/test/java/games/dmg/spigotbase/SecondaryProgressionServiceTest.java new file mode 100644 index 0000000..a796ceb --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/SecondaryProgressionServiceTest.java @@ -0,0 +1,61 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Map; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class SecondaryProgressionServiceTest { + private final PluginSettings settings = PluginSettings.from(Map.of()); + private final SecondaryProgressionService service = new SecondaryProgressionService(settings); + + @Test + void stoneUnlocksFirstSizeTierAfterBaseI() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(250, 1) + .withSizeProgress(499, 0, 0, 0); + + ProgressionUpdate update = service.recordStoneBreak(player); + + assertEquals(1, update.player().sizeLevel()); + assertTrue(update.unlockedSizeLevel()); + } + + @Test + void laterMaterialsDoNotCountBeforeTheirTierIsActive() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(250, 1); + + ProgressionUpdate update = service.recordDeepslateBreak(player); + + assertEquals(0, update.player().deepslateBroken()); + assertFalse(update.unlockedSizeLevel()); + } + + @Test + void threeElytraUnlockAllFlightTiersWithoutConsumption() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(250, 1) + .withBase( + new BaseLocation(UUID.randomUUID(), "world", 0, 64, 0, 0, 0), + java.time.Instant.EPOCH + ); + + ProgressionUpdate update = service.observeElytraCount(player, 3); + + assertEquals(3, update.player().flightLevel()); + assertTrue(update.player().flightEnabled()); + assertTrue(update.unlockedFlightLevel()); + } + + @Test + void secondaryProgressDoesNothingBeforeBaseI() { + PlayerState player = PlayerState.newPlayer(UUID.randomUUID(), "Alex"); + + assertEquals(player, service.recordStoneBreak(player).player()); + assertEquals(player, service.observeElytraCount(player, 3).player()); + } +} diff --git a/src/test/java/games/dmg/spigotbase/TeleportPolicyTest.java b/src/test/java/games/dmg/spigotbase/TeleportPolicyTest.java new file mode 100644 index 0000000..f9e9294 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/TeleportPolicyTest.java @@ -0,0 +1,52 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.Duration; +import java.time.Instant; +import java.util.Map; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class TeleportPolicyTest { + private final TeleportPolicy policy = new TeleportPolicy(PluginSettings.from(Map.of())); + + @Test + void warmupLevelsUseApprovedDurations() { + PlayerState player = baseThreePlayer(); + + assertEquals(Duration.ofSeconds(30), policy.warmup(player)); + assertEquals(Duration.ofSeconds(15), policy.warmup(player.withTeleportLevels(1, 0))); + assertEquals(Duration.ofSeconds(5), policy.warmup(player.withTeleportLevels(2, 0))); + assertEquals(Duration.ZERO, policy.warmup(player.withTeleportLevels(3, 0))); + } + + @Test + void cooldownLevelsUseApprovedDurations() { + PlayerState player = baseThreePlayer(); + + assertEquals(Duration.ofHours(3), policy.cooldown(player)); + assertEquals(Duration.ofHours(2), policy.cooldown(player.withTeleportLevels(0, 1))); + assertEquals(Duration.ofHours(1), policy.cooldown(player.withTeleportLevels(0, 2))); + assertEquals(Duration.ofMinutes(30), policy.cooldown(player.withTeleportLevels(0, 3))); + assertEquals(Duration.ZERO, policy.cooldown(player.withTeleportLevels(0, 4))); + } + + @Test + void remainingCooldownUsesElapsedTime() { + Instant usedAt = Instant.parse("2026-08-09T10:00:00Z"); + PlayerState player = baseThreePlayer().withLastBaseTeleport(usedAt); + + assertEquals( + Duration.ofHours(1), + policy.remainingCooldown(player, usedAt.plus(Duration.ofHours(2))).orElseThrow() + ); + assertTrue(policy.remainingCooldown(player, usedAt.plus(Duration.ofHours(3))).isEmpty()); + } + + private static PlayerState baseThreePlayer() { + return PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(500, 3); + } +} diff --git a/src/test/java/games/dmg/spigotbase/TeleportProgressionServiceTest.java b/src/test/java/games/dmg/spigotbase/TeleportProgressionServiceTest.java new file mode 100644 index 0000000..d10efac --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/TeleportProgressionServiceTest.java @@ -0,0 +1,56 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.Instant; +import java.util.Map; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class TeleportProgressionServiceTest { + private final PluginSettings settings = PluginSettings.from(Map.of()); + private final TeleportProgressionService service = new TeleportProgressionService(settings); + + @Test + void twoHundredthPlacementUnlocksBaseIII() { + PlayerState player = baseTwoPlayer().withTeleportProgress(199, 0, 0, 0, 2); + + ProgressionUpdate update = service.recordPlacement(player); + + assertEquals(3, update.player().baseLevel()); + assertEquals(200, update.player().blocksPlacedInBase()); + assertTrue(update.unlockedBaseLevel()); + } + + @Test + void cumulativePlacementsReduceWarmup() { + PlayerState player = baseTwoPlayer().withTeleportProgress(999, 0, 0, 0, 3); + + ProgressionUpdate update = service.recordPlacement(player); + + assertEquals(1, update.player().warmupLevel()); + assertTrue(update.unlockedWarmupLevel()); + } + + @Test + void cumulativeBreaksReduceCooldownSequentially() { + PlayerState player = baseTwoPlayer().withTeleportProgress(200, 999, 0, 0, 3); + + ProgressionUpdate update = service.recordBreak(player); + + assertEquals(1, update.player().cooldownLevel()); + assertEquals(1_000, update.player().blocksBrokenInBase()); + assertTrue(update.unlockedCooldownLevel()); + } + + private static PlayerState baseTwoPlayer() { + return PlayerState.newPlayer(UUID.randomUUID(), "Alex") + .withGrassAndDirtProgress(500, 2) + .withNavigationEnabled(true) + .withBase( + new BaseLocation(UUID.randomUUID(), "world", 0, 64, 0, 0, 0), + Instant.EPOCH + ); + } +} diff --git a/src/test/java/games/dmg/spigotbase/VisitorPolicyTest.java b/src/test/java/games/dmg/spigotbase/VisitorPolicyTest.java new file mode 100644 index 0000000..6092aa9 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/VisitorPolicyTest.java @@ -0,0 +1,44 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.Duration; +import java.time.Instant; +import java.util.UUID; +import org.junit.jupiter.api.Test; + +final class VisitorPolicyTest { + private final VisitorPolicy policy = new VisitorPolicy(); + + @Test + void onlyBaseIIIPlayerCanPurchaseBaseIV() { + PlayerState baseThree = PlayerState.newPlayer(UUID.randomUUID(), "Owner") + .withGrassAndDirtProgress(500, 3) + .withBase( + new BaseLocation(UUID.randomUUID(), "world", 0, 64, 0, 0, 0), + Instant.EPOCH + ); + + assertTrue(policy.canPurchase(baseThree)); + assertFalse(policy.canPurchase(baseThree.withBaseLevel(4))); + assertFalse(policy.canPurchase( + PlayerState.newPlayer(UUID.randomUUID(), "Locked").withGrassAndDirtProgress(500, 2) + )); + assertFalse(policy.canPurchase( + PlayerState.newPlayer(UUID.randomUUID(), "Unset").withGrassAndDirtProgress(500, 3) + )); + } + + @Test + void visitorCooldownIsIndependentForEachOwner() { + UUID firstOwner = UUID.randomUUID(); + UUID secondOwner = UUID.randomUUID(); + Instant now = Instant.parse("2026-08-09T12:00:00Z"); + PlayerState visitor = PlayerState.newPlayer(UUID.randomUUID(), "Visitor") + .withVisitorCooldown(firstOwner, now.plus(Duration.ofHours(2))); + + assertTrue(policy.remaining(visitor, firstOwner, now).isPresent()); + assertTrue(policy.remaining(visitor, secondOwner, now).isEmpty()); + } +} diff --git a/src/test/java/games/dmg/spigotbase/YamlBaseStateRepositoryTest.java b/src/test/java/games/dmg/spigotbase/YamlBaseStateRepositoryTest.java new file mode 100644 index 0000000..c8603b1 --- /dev/null +++ b/src/test/java/games/dmg/spigotbase/YamlBaseStateRepositoryTest.java @@ -0,0 +1,66 @@ +package games.dmg.spigotbase; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Instant; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +final class YamlBaseStateRepositoryTest { + @TempDir + Path temporaryDirectory; + + @Test + void roundTripsCompletePlayerState() throws Exception { + UUID playerId = UUID.randomUUID(); + UUID worldId = UUID.randomUUID(); + UUID ownerId = UUID.randomUUID(); + BaseLocation base = new BaseLocation(worldId, "world", 12, 70, -8, 90.0F, 5.0F); + PlayerState player = new PlayerState( + playerId, "Alex", Optional.of(base), 4, 3, 2, 3, 4, + 500, 500, 1_000, 1_000, 2_000, 3_000, + true, true, false, true, + Optional.of(Instant.ofEpochMilli(1_750_000_000_000L)), + Optional.of(Instant.ofEpochMilli(1_750_000_100_000L)), + Map.of(ownerId, Instant.ofEpochMilli(1_750_001_000_000L)) + ); + PersistentState expected = new PersistentState(Map.of(playerId, player)); + YamlBaseStateRepository repository = + new YamlBaseStateRepository(temporaryDirectory.resolve("state.yml")); + + repository.save(expected); + + assertEquals(expected, repository.load()); + } + + @Test + void invalidRecordsCannotGrantProgression() throws Exception { + UUID playerId = UUID.randomUUID(); + Path stateFile = temporaryDirectory.resolve("state.yml"); + Files.writeString(stateFile, """ + players: + %s: + name: Alex + base-level: 99 + visitors-enabled: true + """.formatted(playerId)); + + PersistentState loaded = new YamlBaseStateRepository(stateFile).load(); + + assertFalse(loaded.players().containsKey(playerId)); + } + + @Test + void missingFileLoadsEmptyState() throws Exception { + YamlBaseStateRepository repository = + new YamlBaseStateRepository(temporaryDirectory.resolve("missing.yml")); + + assertEquals(PersistentState.empty(), repository.load()); + } +}