Adds multiple home support.

.env.example

@@ -16,6 +16,7 @@ MINECRAFT_BACKUP_PATH=./backups
 # Release version is read from Gradle's Git-sensitive semantic version and checked against the jar's plugin.yml.
 MODRINTH_TOKEN=
 MODRINTH_PROJECT_ID=metropolis-builder
+# Optional Markdown override; empty generates notes from commits since the last tag.
 MODRINTH_CHANGELOG=
 MODRINTH_GAME_VERSIONS=26.2
 MODRINTH_LOADERS=paper

.github/workflows/gradle.yml

@@ -0,0 +1,45 @@
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@v6
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+
+      - name: Setup Gradle 9.8.0
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          gradle-version: '9.8.0'
+          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
+
+      - name: Build with Gradle Wrapper
+        run: ./tools/build-plugin.sh
+
+      - name: Extract Project Version
+        id: project_info
+        run: |
+          VERSION=$(./gradlew properties --no-daemon -q | awk -F ': ' '$1 == "version" {print $2}')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Upload Plugin Artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: Metropolis-${{ steps.project_info.outputs.version }}
+          path: build/libs/*.jar
+          if-no-files-found: error
+          retention-days: 14

Human-Tests.md

@@ -0,0 +1,79 @@
+# Metropolis Human Testing
+
+Use this checklist for behavior that depends on a real Paper world, player interactions, or the installed WorldGuard and WorldEdit plugins. Automated tests cover some isolated logic, but they do not establish that the complete in-game workflows behave correctly.
+
+## Test Environment
+
+- Use a disposable Paper 26.2 or 26.3 server with Java 25+, WorldGuard 7.0.19, WorldEdit 7.4.5, and Metropolis installed.
+- Back up the server before testing. Home generation, reservations, and configuration can change world blocks and WorldGuard regions.
+- Use at least two non-operator player accounts for ownership and protection checks. Operators can bypass protection and hide permission problems.
+- Keep a server console open and check it for errors after startup, commands, joins, and restarts.
+- Record the Metropolis config, world name, test player UUIDs, command output, and any unexpected region bounds or block changes.
+
+## Human Checklist
+
+### Startup and world setup
+
+- Start with the required plugins enabled. Confirm Metropolis enables without errors and its commands are registered. Also confirm startup fails clearly if a required dependency or configured world is missing, then restore the valid setup.
+- On a fresh test world, inspect the `City` and `Spawn` WorldGuard regions. Check their bounds, flags, and priority; verify the configured spawn generation and world-spawn location.
+- Restart once with existing regions. Confirm Metropolis recognizes them instead of duplicating or resetting them, and that existing city bounds and player homes remain intact.
+
+### Join and plot allocation
+
+- Join as a new player. Confirm one home is allocated and the welcome message reports its actual bounds. Check the corresponding `h_1_<UUID>` region has the player as owner and its bounds match the configured plot size.
+- Join with a second new player. Confirm the new home is distinct, does not overlap the first home or spawn, and the City region grows to include it.
+- Join again as an existing player. Confirm the same home is selected and no duplicate region or plot is created.
+- Reserve an area before allocating another home. Confirm future allocations skip it. Repeat with reservations near the city edge and near existing roads to look for overlaps or gaps.
+- Test a user override that grants a different plot multiplier or home limit. Confirm the generated bounds and allowed number of homes match the override, and that the configured global defaults still apply to other players.
+
+### Generated blocks and geometry
+
+- Inspect a newly allocated home and adjoining roads. Check road width, level, material, clearance, plot floor, support blocks, and optional sign against the active config.
+- Test generation over varied terrain, including water, caves, uneven ground, and existing structures. Confirm generated floors and roads do not leave unsafe gaps or erase blocks outside their intended area.
+- Enable and disable optional floor, support, sign, spawn, world-spawn, and perimeter-wall settings one at a time on a disposable world. Confirm each setting changes only its intended behavior.
+- Allocate plots in several directions and near the world origin. Check road joins, plot dimensions, City region expansion, and boundary coordinates for symmetry and off-by-one errors.
+
+### Reservations and protection
+
+- Reserve one plot with explicit coordinates. Then make a WorldEdit selection and reserve a second plot using `/metropolis-plot-reserve <name>`.
+- Try invalid coordinates, a duplicate region name, and bounds that intersect a home or another reservation. Confirm the command reports a useful failure and does not silently overwrite an existing region.
+- Check `/metropolis-home-list` and `/metropolis-plot-go <plotName>` for both occupied homes and reservations; confirm teleport destinations are safe and inside the requested plot.
+- As the home owner, build and interact inside the home. As another non-op player, try the same actions. Verify ownership and protection behave as intended in homes, reservations, City, and Spawn.
+- Verify representative protection flags in-game, including PvP, mob damage/spawning, explosions, and fire/lava behavior where applicable. Run `/metropolis-flag-reset` and confirm the expected flags are restored without changing region bounds or ownership.
+- Restart the server and confirm reservations and their protection are still present in WorldGuard and remain excluded from home allocation.
+
+### Commands, permissions, and player state
+
+- For a new player with no overrides, join and confirm exactly one `h_1_<UUID>` home is created. Rejoin and confirm no additional home is created.
+- Configure two `permissionOverrides` tiers in `plugins/Metropolis/config.yml`, then restart. Grant each permission node to a test user and to a test group through the server's permission manager. Confirm the player's effective `plotMultiplier` and `maxPlots` match the granted rule.
+- Give one player multiple configured permission nodes with different priorities. Confirm the highest-priority rule controls both values; then give two matching rules the same priority and confirm the last matching YAML entry wins.
+- Give a player both a permission tier and a matching `userOverrides` entry. Confirm the username override wins. Remove both overrides from another player and confirm `plot.multiplier` and `plot.maxPerPlayer` are used as defaults.
+- Change or revoke a permission while the player is online, then acquire another home. Confirm the next acquisition uses the currently granted tier without requiring a restart.
+- With plot multipliers of 1 and 2, acquire homes and inspect their WorldGuard bounds. Confirm size follows the tier, a larger footprint does not overlap an existing home, and the multiplier is applied to the X and Z footprint only once.
+- Exercise `/metropolis-home-acquire` below and at each effective home limit. Confirm every successful request creates a distinct next-numbered home, creates none beyond the limit, and does not change other players' homes.
+- After acquiring a second home, verify it becomes active: check the player's selected home in `plugins/Metropolis/currentHomes.yml` and use `/metropolis-home-go` to confirm travel to that home. Switch homes with `/metropolis-home-move` and verify the selection changes as expected.
+- Restart after acquiring multiple homes. Confirm all home regions remain owned by the player, the active home selection persists, and joining does not allocate another first home.
+- Generate a home for an offline player administratively. Confirm permission tiers are not assumed for offline players; the username override or global settings determine plot size and limit.
+- Exercise `/metropolis-home-go` with a safe bed spawn inside the home and with no such bed spawn. Confirm teleportation chooses a valid location inside the home and reports a clear failure if no safe location exists.
+- Exercise `/metropolis-home-move` for a player with multiple homes. Confirm the selected home persists across reconnect and restart; reject nonexistent home numbers.
+- As an administrator, test `/metropolis-home-generate`, `/metropolis-home-evict`, and `/metropolis-home-list` with online and previously seen offline players. Confirm the intended region ownership changes, persistence, and subsequent allocation behavior.
+- Test commands as console, permitted player, and player without the relevant permission. Check player-only commands, target-player arguments, unknown names, malformed arguments, and permission denials for useful feedback and no unintended changes.
+- If upgrading an existing server, verify a legacy name-keyed `currentHomes.yml` entry resolves to the right UUID and the player's selected home is retained.
+
+## Existing Automated Coverage
+
+Run `./gradlew test` for the server-free JUnit suite. It has 17 tests covering:
+
+- `CuboidTest`: WorldEdit bound conversion, vector ordering/null handling, touching intersections, and point containment.
+- `CurrentHomesStoreTest`: UUID-based persistence and resolving a legacy player-name key.
+- `PlayerJoinListenerTest`: the welcome bounds message when a home is supplied by a mock.
+- `PlayerLookupTest`: case-insensitive full-name matching and rejection of prefix matching.
+- `PlayerHomeTest`: UUID-based region identity and display-name retention.
+- `HomePermissionOverrideTest`: dotted permission-node parsing, priority and tie resolution, invalid entries, and username/permission/default precedence.
+- `HomeNumberAllocatorTest`: choosing the first unused positive home number.
+- `MetropolisPlotReserveCommandTest`: parsing six coordinates and rejecting malformed coordinates.
+- `MetropolisHomeAcquireTest`: acquisition below the limit and refusal at the limit.
+
+The two opt-in tests in `src/integrationTest` require a running Paper server and RCON. They check that Metropolis appears in `/plugins` and that a coordinate reservation is persisted by WorldGuard. They do not currently verify restart persistence, join allocation, WorldEdit-selection reservations, permissions, teleports, generated blocks, protection behavior, or the other command workflows above. Run them with the environment variables documented in `README.md`; use a disposable server because the reservation test changes its WorldGuard data.
+
+The integration scope described in `TODO.md` is broader than the tests currently present. Treat the scenarios in this guide as unverified until a human has run them on the target Paper and plugin versions.

Modrinth-Description.md

@@ -0,0 +1,45 @@
+**Metropolis**
+
+Metropolis grows a protected Minecraft city as players join. It assigns home plots connected by roads, expands the protected city region, and lets players and administrators manage homes and reserve plots.
+
+## Requirements
+
+- Paper 26.2 or 26.3.
+- Java 25 or newer.
+- WorldGuard 7.0.19 and WorldEdit 7.4.5.
+
+WorldGuard and WorldEdit are required dependencies. Install all three plugins in the server's `plugins` directory.
+
+Metropolis targets Paper only; Bukkit and Spigot servers are not supported.
+
+## Features
+
+- Automatically assigns a protected home plot when a player joins.
+- Allows players to acquire additional homes up to their configured limit, with per-player overrides.
+- Expands the protected city region as plots are occupied.
+- Configures plot dimensions, roads, floors, supports, signs, spawn behavior, and perimeter walls.
+- Reserves named plots by coordinates or a WorldEdit selection.
+- Tracks home ownership and selected homes by player UUID.
+- Supports home and plot teleportation, administration, and WorldGuard protection flags.
+
+## Configuration
+
+Metropolis creates `plugins/Metropolis/config.yml` on first startup. Configure plot limits and dimensions, roads, floors and supports, signs, spawn behavior, walls, world name, and per-player overrides. Use Bukkit material names; legacy numeric material IDs are also accepted for existing configurations.
+
+## Commands
+
+- `/metropolis` - Displays the plugin version.
+- `/metropolis-home-acquire` - Acquires another available home plot.
+- `/metropolis-home-generate <playerName>` - Generates a home for a known online or cached offline player.
+- `/metropolis-home-list` - Lists occupied and reserved plots.
+- `/metropolis-home-go [playerName]` - Teleports to a home.
+- `/metropolis-home-move <homeNumber> [playerName]` - Selects a player's home.
+- `/metropolis-home-evict <playerName>` - Removes a player's ownership from their selected home region.
+- `/metropolis-plot-reserve <name> <minX> <minY> <minZ> <maxX> <maxY> <maxZ>` - Reserves a region by coordinates; players can use `/metropolis-plot-reserve <name>` with a WorldEdit selection.
+- `/metropolis-plot-go <plotName> [playerName]` - Teleports to a named plot.
+- `/metropolis-flag-reset` - Reapplies Metropolis protection flags.
+- `/metropolis-debug-generatetesthomes <count>` - Generates test homes; intended for development servers.
+
+## Build
+
+Run `./gradlew build` from the project directory. The plugin jar is created in `build/libs/`.

Modrinth.json

@@ -0,0 +1,13 @@
+{
+  "name": "Metropolis",
+  "url": "https://modrinth.com/plugin/metropolis-builder",
+  "summary": "Grow a protected Minecraft city with automatic UUID-owned homes, configurable roads, WorldGuard protection, and reserved plots.",
+  "visibility": "public",
+  "links": {
+    "issueTracker": "https://github.com/headhunter45/Metropolis/issues",
+    "sourceCode": "https://github.com/headhunter45/Metropolis",
+    "wikiPage": null,
+    "discordInvite": null,
+    "donationLinks": []
+  }
+}

Project-Description.json

@@ -1,7 +1,7 @@
 {
   "id": "metropolis",
   "title": "Metropolis",
-  "description": "Paper plugin that automatically creates protected home plots and connecting roads as players join a Minecraft server.",
+  "description": "A Paper 26.2/26.3 city-planning plugin that turns player onboarding into procedural urban growth with protected UUID-owned homes, roads, reservations, and configurable infrastructure.",
   "docId": "Metropolis",
   "image": {
     "url": "Pixel-art aerial view of a growing Minecraft city planned in a square grid, small player home plots connected by pale roads, a protected central spawn, blocky green landscape, subtle WorldGuard-inspired boundary lines, warm daylight, clean game-plugin thumbnail composition, no words or logos.",

Project-Description.md

@@ -1,12 +1,5 @@
 # Metropolis
 
-Metropolis is a Paper plugin that expands a protected Minecraft city as players join. It generates home plots and connecting roads, uses WorldGuard to protect the city and homes, and supports reserved plots and home teleportation.
+Metropolis turns player onboarding into city planning. As players arrive, the Paper plugin finds the next available plot, builds the surrounding roads and infrastructure, and extends a WorldGuard-protected city that feels designed rather than randomly generated.
 
-## Platform
+The project combines procedural spatial logic, persistent UUID-based ownership, configurable construction rules, WorldEdit-assisted reservations, and a command suite for moving, acquiring, listing, and administering homes. It is also a modernization case study: a legacy plugin brought forward to Paper 26.2 and 26.3 with Gradle, focused unit tests, and opt-in live-server integration tests. Bukkit and Spigot servers are outside the support target.
-
-- Paper 26.2, Java 25+
-- WorldGuard 7.0.19 and WorldEdit 7.4.5
-- Built with Gradle 9.8 and Git-sensitive semantic versioning
-- Configuration: `plugins/Metropolis/config.yml`
-- Unit tests run without a server; live integration tests use the separate Gradle `integrationTest` task.
-- License: GNU General Public License v3

README.md

@@ -2,9 +2,18 @@
 
 Metropolis expands a protected Minecraft city as players join. Each player can receive a home plot connected by generated roads; WorldGuard protects the city, homes, and reserved plots.
 
+## Features
+
+- Assigns a protected home plot when a player joins and supports acquiring additional homes up to the configured player limit.
+- Expands the City region as plots are occupied, with optional spawn generation, world-spawn placement, floors, support blocks, signs, and perimeter walls.
+- Generates roads around plots with configurable width, level, material, clearance, and supports.
+- Creates named protected reservations from coordinates or a WorldEdit selection so reserved plots are not assigned as homes.
+- Persists selected homes by player UUID and recognizes legacy name-based home data during migration.
+- Supports online/offline player administration for home generation, movement, and eviction.
+
 ## Requirements
 
-- Paper 26.2, with Java 25 or newer
+- Paper 26.2 or 26.3, with Java 25 or newer
 - WorldGuard 7.0.19
 - WorldEdit 7.4.5
 
@@ -41,26 +50,44 @@ Copy `.env.example` to `.env` and configure the Paper version/build and server p
 - `tools/start-server.sh` downloads the configured Paper build if needed and starts it.
 - `tools/backup-server.sh` and `tools/restore-server.sh` back up or restore the configured server.
 - `tools/publish-local.sh` publishes the artifact to the local Maven repository.
-- `tools/publish-modrinth.sh` uploads a built jar after checking its version.
+- `tools/publish-modrinth.sh` uploads a built jar after checking its version and generates a Markdown changelog from Git commits since the previous version tag. Set `MODRINTH_CHANGELOG` to override it with curated notes.
+
 
 ## Configuration
 
-The default configuration is in `src/main/resources/config.yml` and is copied to `plugins/Metropolis/config.yml` on first startup. Materials use Bukkit names; the previous numeric IDs for stone, grass, cobblestone, and bedrock are still accepted when loading a configuration.
+`plugins/Metropolis/config.yml` controls plot dimensions and limits, floor and support generation, signs, road width/level/material/clearance, spawn behavior, wall generation, world name, and per-player overrides. `plot.multiplier` sets the default plot-size multiplier; `plot.maxPerPlayer` sets the default home limit.
 
-Player home ownership and selected-home data use UUIDs. Existing name-keyed `currentHomes.yml` entries and name-based WorldGuard home regions are recognized during migration.
+Use `permissionOverrides` to assign plot size and home limits through any permission manager. Each permission node maps to a `priority`, `plotMultiplier`, and `maxPlots`; the matching node with the highest priority wins, and the last matching entry in YAML order wins ties. An explicit username entry in `userOverrides` takes precedence over permission rules. If no override matches, the global `plot.*` defaults apply. For example:
+
+```yaml
+permissionOverrides:
+	metropolis.plots.vip:
+		priority: 10
+		plotMultiplier: 2
+		maxPlots: 2
+	metropolis.plots.elite:
+		priority: 20
+		plotMultiplier: 3
+		maxPlots: 5
+```
+
+Assign these permission nodes to groups or individual users in your permission plugin. Bukkit permissions are boolean, so the configured values determine the numeric limits. The bundled configuration provides the defaults. Metropolis targets Paper 26.2 and 26.3 only; Bukkit and Spigot servers are not supported.
 
 ## Commands
 
-- `/metropolis` displays the plugin version.
+| Command | Permission | Description |
-- `/metropolis-home-acquire` acquires an available home plot.
+| --- | --- | --- |
-- `/metropolis-home-generate <player>` generates a home for a known online or cached offline player.
+| `/metropolis` | None | Displays the plugin version. |
-- `/metropolis-home-list` lists Metropolis plots.
+| `/metropolis-home-acquire` | Player only | Acquires an available home if the player's home limit is not reached. |
-- `/metropolis-home-go [player]` teleports to a home.
+| `/metropolis-home-generate <playerName>` | `metropolis.home.generate` | Generates a home for an online or cached offline player. |
-- `/metropolis-home-move <home-number> [player]` changes a player's selected home.
+| `/metropolis-home-list` | `metropolis.home.list` | Lists the occupied and reserved Metropolis plots with their bounds. |
-- `/metropolis-home-evict <player>` removes a player's home ownership.
+| `/metropolis-home-go [playerName]` | `metropolis.home.go` | Teleports the sender, or a permitted target player, to their home. |
-- `/metropolis-plot-reserve <name> <minX> <minY> <minZ> <maxX> <maxY> <maxZ>` reserves coordinates; a player may instead provide a WorldEdit selection.
+| `/metropolis-home-move <homeNumber> [playerName]` | `metropolis.home.move` | Selects one of a player's existing home regions. The player argument defaults to the sender. |
-- `/metropolis-plot-go <plot-name> [player]` teleports to a plot.
+| `/metropolis-home-evict <playerName>` | `metropolis.home.evict` | Removes the player's ownership from their selected home region. |
-- `/metropolis-flag-reset` reapplies Metropolis protection flags.
+| `/metropolis-plot-reserve <name> <minX> <minY> <minZ> <maxX> <maxY> <maxZ>` | `metropolis.plot.reserve` | Creates a named reservation from explicit bounds. A player can instead run `/metropolis-plot-reserve <name>` with a WorldEdit selection. |
+| `/metropolis-plot-go <plotName> [playerName]` | `metropolis.plot.go` | Teleports the sender or target player to a named occupied or reserved plot. |
+| `/metropolis-flag-reset` | `metropolis.flag.reset` | Reapplies Metropolis protection flags to the City and home regions. |
+| `/metropolis-debug-generatetesthomes <count>` | `metropolis.debug` | Generates test homes; intended for development servers. |
 
 ## License
 

TODO.md

@@ -24,18 +24,23 @@
 | MET-020 |   Done   | Adopt the git-sensitive semantic versioning Gradle plugin used by MobScores and ScoreKeeper, using the existing 0.5-SNAPSHOT version as the migration baseline; verify version/tag behavior and enable the Gradle configuration cache when compatible. |
 | MET-021 |   Done   | Update README.md, CONTRIBUTING.md, other documentation, and project scripts with the Gradle build, test, versioning, and modern Paper server workflow. |
 | MET-022 | Planning | (Optional) Add new features, quality-of-life improvements, or CI configuration after the modernization and documentation tasks are complete. |
+| MET-023 | Planning | Add an optional home-allocation policy that grants all remaining homes up to a player's limit when they join. |
+| MET-024 | Planning | Add an optional home-allocation policy that grants at most one additional home per login until the player's limit is reached. |
+| MET-025 | Planning | Add a configuration option to choose the plot-allocation traversal algorithm: concentric rectangles/cuboids or concentric rings that prefer a free location near the center. |
+| MET-026 | Planning | Research a world-conversion option for existing Metropolis worlds, including how to safely adapt existing regions and generated roads/plots. |
 | GIT-009 | Planning | i have three reserve plots and one just got overwritten when a new player joined. |
 | GIT-008 |   Ready  | Implement multiple plot sizes by granting multiple plots around each other. 
-| GIT-007 |   Ready  | Allow buying and selling of homes via an ecnoomy plugin. |
+| GIT-007 | Planning | Allow buying and selling of homes via an ecnoomy plugin. |
 | GIT-006 |   Ready  | Add levels support. |
 | GIT-005 | Planning | Add the possibility to create multiple plot homes in shapes. |
-| GIT-004 |   Ready  | Add a command to request home allocation. |
+| GIT-004 | Planning | Add a command to request home allocation. |
 | GIT-003 |   Ready  | Add support for multiple homes. |
-| GIT-002 |   Ready  | Add a command to teleport to a reservation you are part of. |
+| GIT-002 | Planning | Add a command to teleport to a reservation you are part of. |
-| GIT-001 |   Ready  | Add a command to move to a different home. |
+| GIT-001 | Planning | Add a command to move to a different home. |
 
 # GIT-001 - Add a command to move to a different home.
 **Status:** Ready
+**Depends On:** [GIT-003](#git-003---add-support-for-multiple-homes)
 **Descriptioon:** 
 
 /metropolis-home-move [playerName]
@@ -44,6 +49,7 @@ This command should set the target player's home to the plot defined by .
 
 # GIT-002 - Add a command to teleport to a reservation you are part of.
 **Status:** Ready
+**Depends On:** [GIT-003](#git-003---add-support-for-multiple-homes)
 **Description:**
 
 /metropolis-plot-go [playerName]
@@ -55,21 +61,19 @@ The reservation to teleport to is
 Or better yet just use uhome or create your own, integrated that records the home location at the height set in the configuration file, but on the road next to the plot. Using existing plugins to insert into SQL say uhome, would allow privatization and minimal work on your end.
 
 # GIT-003 - Add support for multiple homes
- 
+
-**Status:** Ready
+**Status:** Done
 **Description:**
 
-The max number of homes per player should be defined by a permission such as
+Add a top-level `permissionOverrides` map keyed by permission node. Each rule defines `priority`, `plotMultiplier`, and `maxPlots`; any permission manager can grant the boolean nodes to groups or individual players. For online players, the matching rule with the highest priority wins, with the last matching entry in YAML order breaking ties. An explicit `userOverrides` entry takes precedence over permission rules. Without either override, use `plot.multiplier` and `plot.maxPerPlayer`. Offline-player generation uses username overrides or global defaults because permissions are only queried for online players.
-metropolis.maxhomes: 2
 
-A config option should be added to determine when the homes are added with at least the following options
+On join, automatically allocate one home only when the player has no existing home, and restore a valid existing home as active if the saved selection is missing. Additional homes must be explicitly requested with `/metropolis-home-acquire`, up to the player's effective limit. Acquisition allocates the first unused positive home number and makes the new home active.
 
-Allocate all homes that aren't allocated on login
+The alternative login allocation policies are tracked separately in MET-023 and MET-024; they are not part of the default policy in this task.
-Allocate at most 1 home per login
-Only allocate the first home on login, and require a command to allocate additional homes.
 
 # GIT-004 - Add a command to request home allocation.
 **Status:** Ready
+**Depends On:** [GIT-003](#git-003---add-support-for-multiple-homes)
 **Description:**
 
 Add a command that users can type to get their first or subsequent homes.
@@ -88,10 +92,21 @@ Add the possibility to create multiple plot homes in shapes
 **Status:** Ready
 **Description:**
 
-Allow generating multilevel cities with stairs or interchanges to go between levels (streets are level but avenues are ramps.
+Add multiple vertical levels to the city. Use the existing `road.level` as the base Y: the bottom of a ground-level plot is at that Y, and `plot.sizeY` defines the full plot height. For example, a five-block-high plot includes its floor at road level, three usable blocks, and a roof block; all five blocks belong to the plot region. Use the same plot-dimension-plus-road-spacing grid pitch vertically as horizontally; when road width is zero, adjacent plot volumes may touch. Do not allocate a plot if its full extent would exceed the world's buildable area. If the search cannot find any valid plot, log an allocation error and do not create the plot or region. The current config example is not intended for a multilevel world; request an updated `config.yml` before implementation. Existing `plot.offsetX`, `plot.offsetY`, and `plot.offsetZ` nudge the grid; `plot.multiplier`, `userOverrides[username].plotMultiplier`, and future `permissionOverrides[permission_name].plotMultiplier` affect plot size.
+
+Add a maximum-level config value. If unset, default to 1; administrators can increase it to enable more levels. Allocate plots in X, Z, Y axis order: scan X from negative to positive, then increment Z, and only after scanning the X/Z area increment Y to the next level (Y outermost, Z middle, X innermost). For equal-distance candidates, use the same negative-to-positive X ordering. The selectable X/Z traversal shapes are tracked separately in MET-025.
+
+Streets run along X and avenues run along Z. Streets remain level; avenues connect levels with stairs placed beside plots at a configurable cadence. Add `stairs.*`, `road.streets.*`, and `road.avenues.*` configuration. The street and avenue sections should each contain the current `road.*` settings plus `generateStairs`. Configure stair material, width, and `everyNBlocks`; this cadence is measured in plot-sized avenue blocks, so 3 means stairs beside every third plot along an avenue. Allow stairs to be configured independently for each direction, including different widths. Validate each enabled direction against its corresponding road width; if its stairs are not thinner than that road, log an error but continue plugin startup.
+
+Keep spawn on its current level. Add independent X, Y, and Z spawn-size multipliers, each expressed as a multiple of the corresponding plot dimension and road spacing so roads line up with differently sized plots. The Y multiplier controls spawn's vertical height upward from `road.level`.
+
+When allocating plots in an existing world, treat saved WorldGuard regions as occupied: never overwrite a region or create a new region that overlaps an existing one, even if avoiding overlaps leaves irregular gaps between plots and roads. Document this behavior so users know to expect it. Research a possible world-conversion option separately under MET-026; conversion requires further investigation.
+
+This intentionally breaks the existing config schema: do not add a legacy `road.*` fallback or automatic migration. Document the config changes in release notes and make the breaking change in the 0.6.x release line.
 
 # GIT-007 - Allow buying and selling of homes via an ecnoomy plugin.
-**Status:** Ready
+**Status:** Blocked
+**Blockers:** Figure out how to integrate with economy plugins.
 **Description:**
 
 Allow buying and selling of homes via an ecnoomy plugin. Include decent real estate support including wtb and wts listings as well as an auction facility.

build.gradle

@@ -1,4 +1,5 @@
 plugins {
+    id 'com.diffplug.spotless' version '8.10.3'
     id 'java-library'
     id 'maven-publish'
     id 'org.danilopianini.git-sensitive-semantic-versioning' version '7.0.24'
@@ -9,7 +10,7 @@ description = 'Metropolis'
 
 gitSemVer {
     minimumVersion.set('0.5.0')
-    versionPrefix.set('')
+    versionPrefix.set('v')
 }
 
 repositories {
@@ -87,4 +88,15 @@ tasks.named('wrapper') {
     distributionPath = '.gradle/wrapper/dists'
     archiveBase = Wrapper.PathBase.PROJECT
     archivePath = '.gradle/wrapper/dists'
+}
+
+spotless {
+    java {
+        googleJavaFormat('1.36.1')
+        importOrder 'java', 'javax', 'com', 'net', 'org', ''
+        licenseHeaderFile 'config/license-header.txt'
+        target 'src/**/*.java'
+        removeUnusedImports()
+        toggleOffOn()
+    }
 }

config/license-header.txt

@@ -0,0 +1,17 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+

src/integrationTest/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisServerIntegrationTest.java

@@ -1,3 +1,20 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -15,110 +32,114 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.junit.jupiter.api.Test;
 
 class MetropolisServerIntegrationTest {
-	@Test
+  @Test
-	void runningPaperLoadsMetropolis() throws IOException {
+  void runningPaperLoadsMetropolis() throws IOException {
-		String installedPlugins;
+    String installedPlugins;
-		try (RconClient rcon = connectToConfiguredServer()) {
+    try (RconClient rcon = connectToConfiguredServer()) {
-			installedPlugins = rcon.execute("plugins");
+      installedPlugins = rcon.execute("plugins");
-		}
+    }
-		assertTrue(installedPlugins.contains("Metropolis"), installedPlugins);
+    assertTrue(installedPlugins.contains("Metropolis"), installedPlugins);
-	}
+  }
 
-	@Test
+  @Test
-	void plotReservationIsPersistedByTheLoadedWorldGuardPlugin() throws IOException {
+  void plotReservationIsPersistedByTheLoadedWorldGuardPlugin() throws IOException {
-		String regionId = "metropolis-it-" + UUID.randomUUID().toString().substring(0, 8);
+    String regionId = "metropolis-it-" + UUID.randomUUID().toString().substring(0, 8);
-		try (RconClient rcon = connectToConfiguredServer()) {
+    try (RconClient rcon = connectToConfiguredServer()) {
-			String response = rcon.execute("metropolis-plot-reserve " + regionId + " 100 60 100 105 70 105");
+      String response =
-			assertTrue(response.contains("Reserved plot region " + regionId), response);
+          rcon.execute("metropolis-plot-reserve " + regionId + " 100 60 100 105 70 105");
-		}
+      assertTrue(response.contains("Reserved plot region " + regionId), response);
+    }
 
-		Path serverDirectory = Path.of(requiredEnvironment("METROPOLIS_SERVER_DIR"));
+    Path serverDirectory = Path.of(requiredEnvironment("METROPOLIS_SERVER_DIR"));
-		String worldName = System.getenv().getOrDefault("METROPOLIS_WORLD", "world");
+    String worldName = System.getenv().getOrDefault("METROPOLIS_WORLD", "world");
-		Path regionsFile = serverDirectory.resolve("plugins/WorldGuard/worlds")
+    Path regionsFile =
-				.resolve(worldName)
+        serverDirectory
-				.resolve("regions.yml");
+            .resolve("plugins/WorldGuard/worlds")
-		YamlConfiguration regions = YamlConfiguration.loadConfiguration(regionsFile.toFile());
+            .resolve(worldName)
+            .resolve("regions.yml");
+    YamlConfiguration regions = YamlConfiguration.loadConfiguration(regionsFile.toFile());
 
-		assertTrue(regions.contains("regions." + regionId), "WorldGuard did not persist region " + regionId);
+    assertTrue(
-	}
+        regions.contains("regions." + regionId), "WorldGuard did not persist region " + regionId);
+  }
 
-	private static RconClient connectToConfiguredServer() throws IOException {
+  private static RconClient connectToConfiguredServer() throws IOException {
-		String host = requiredEnvironment("METROPOLIS_RCON_HOST");
+    String host = requiredEnvironment("METROPOLIS_RCON_HOST");
-		int port = Integer.parseInt(requiredEnvironment("METROPOLIS_RCON_PORT"));
+    int port = Integer.parseInt(requiredEnvironment("METROPOLIS_RCON_PORT"));
-		String password = requiredEnvironment("METROPOLIS_RCON_PASSWORD");
+    String password = requiredEnvironment("METROPOLIS_RCON_PASSWORD");
-		return new RconClient(host, port, password);
+    return new RconClient(host, port, password);
-	}
+  }
 
-	private static String requiredEnvironment(String name) {
+  private static String requiredEnvironment(String name) {
-		String value = System.getenv(name);
+    String value = System.getenv(name);
-		if (value == null || value.isBlank()) {
+    if (value == null || value.isBlank()) {
-			throw new IllegalStateException("Set " + name + " to run integrationTest.");
+      throw new IllegalStateException("Set " + name + " to run integrationTest.");
-		}
+    }
-		return value;
+    return value;
-	}
+  }
 
-	private static final class RconClient implements AutoCloseable {
+  private static final class RconClient implements AutoCloseable {
-		private final Socket socket = new Socket();
+    private final Socket socket = new Socket();
-		private final DataInputStream input;
+    private final DataInputStream input;
-		private final DataOutputStream output;
+    private final DataOutputStream output;
-		private int requestId = 1;
+    private int requestId = 1;
 
-		private RconClient(String host, int port, String password) throws IOException {
+    private RconClient(String host, int port, String password) throws IOException {
-			socket.connect(new InetSocketAddress(host, port), 5000);
+      socket.connect(new InetSocketAddress(host, port), 5000);
-			socket.setSoTimeout(5000);
+      socket.setSoTimeout(5000);
-			input = new DataInputStream(socket.getInputStream());
+      input = new DataInputStream(socket.getInputStream());
-			output = new DataOutputStream(socket.getOutputStream());
+      output = new DataOutputStream(socket.getOutputStream());
-			int authId = requestId++;
+      int authId = requestId++;
-			Packet response = send(authId, 3, password);
+      Packet response = send(authId, 3, password);
-			if (response.id != authId) {
+      if (response.id != authId) {
-				throw new IOException("RCON authentication failed.");
+        throw new IOException("RCON authentication failed.");
-			}
+      }
-		}
+    }
 
-		private String execute(String command) throws IOException {
+    private String execute(String command) throws IOException {
-			return send(requestId++, 2, command).payload;
+      return send(requestId++, 2, command).payload;
-		}
+    }
 
-		private Packet send(int id, int type, String payload) throws IOException {
+    private Packet send(int id, int type, String payload) throws IOException {
-			byte[] data = payload.getBytes(StandardCharsets.UTF_8);
+      byte[] data = payload.getBytes(StandardCharsets.UTF_8);
-			writeLittleEndianInt(data.length + 10);
+      writeLittleEndianInt(data.length + 10);
-			writeLittleEndianInt(id);
+      writeLittleEndianInt(id);
-			writeLittleEndianInt(type);
+      writeLittleEndianInt(type);
-			output.write(data);
+      output.write(data);
-			output.writeByte(0);
+      output.writeByte(0);
-			output.writeByte(0);
+      output.writeByte(0);
-			output.flush();
+      output.flush();
 
-			int length = readLittleEndianInt();
+      int length = readLittleEndianInt();
-			byte[] packet = input.readNBytes(length);
+      byte[] packet = input.readNBytes(length);
-			if (packet.length != length || length < 10) {
+      if (packet.length != length || length < 10) {
-				throw new IOException("Received an invalid RCON packet.");
+        throw new IOException("Received an invalid RCON packet.");
-			}
+      }
-			int responseId = littleEndianInt(packet, 0);
+      int responseId = littleEndianInt(packet, 0);
-			String response = new String(packet, 8, length - 10, StandardCharsets.UTF_8);
+      String response = new String(packet, 8, length - 10, StandardCharsets.UTF_8);
-			return new Packet(responseId, response);
+      return new Packet(responseId, response);
-		}
+    }
 
-		private void writeLittleEndianInt(int value) throws IOException {
+    private void writeLittleEndianInt(int value) throws IOException {
-			output.writeInt(Integer.reverseBytes(value));
+      output.writeInt(Integer.reverseBytes(value));
-		}
+    }
 
-		private int readLittleEndianInt() throws IOException {
+    private int readLittleEndianInt() throws IOException {
-			return Integer.reverseBytes(input.readInt());
+      return Integer.reverseBytes(input.readInt());
-		}
+    }
 
-		private static int littleEndianInt(byte[] bytes, int offset) {
+    private static int littleEndianInt(byte[] bytes, int offset) {
-			return (bytes[offset] & 0xff)
+      return (bytes[offset] & 0xff)
-					| ((bytes[offset + 1] & 0xff) << 8)
+          | ((bytes[offset + 1] & 0xff) << 8)
-					| ((bytes[offset + 2] & 0xff) << 16)
+          | ((bytes[offset + 2] & 0xff) << 16)
-					| (bytes[offset + 3] << 24);
+          | (bytes[offset + 3] << 24);
-		}
+    }
 
-		@Override
+    @Override
-		public void close() throws IOException {
+    public void close() throws IOException {
-			socket.close();
+      socket.close();
-		}
+    }
-	}
+  }
 
-	private record Packet(int id, String payload) {}
+  private record Packet(int id, String payload) {}
-}
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/Cuboid.java

@@ -1,220 +1,265 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
-
-import org.bukkit.Location;
-
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
 
+import org.bukkit.Location;
+
 public class Cuboid implements Comparable<Cuboid> {
-	private int id;
+  private int id;
-	
-	public int minX;
-	public int minY;
-	public int minZ;
-	
-	public int maxX;
-	public int maxY;
-	public int maxZ;
-	
-	public int getId(){
-		return id;
-	}
-	
-	public void setId(int id){
-		this.id = id;
-	}
-	
-	public Cuboid(int minX, int minY, int minZ, int maxX, int maxY, int maxZ){
-		this.minX = minX;
-		this.minY = minY;
-		this.minZ = minZ;
-		this.maxX = maxX;
-		this.maxY = maxY;
-		this.maxZ = maxZ;
-	}
-	
-	public Cuboid(BlockVector3 min, BlockVector3 max) {
-		this.minX = min.x();
-		this.minY = min.y();
-		this.minZ = min.z();
-		this.maxX = max.x();
-		this.maxY = max.y();
-		this.maxZ = max.z();
-	}
 
-	public Cuboid() {
+  public int minX;
-		this.minX = 0;
+  public int minY;
-		this.minY = 0;
+  public int minZ;
-		this.minZ = 0;
-		this.maxX = 0;
-		this.maxY = 0;
-		this.maxZ = 0;
-	}
 
-	public Cuboid(Region selection) {
+  public int maxX;
-		this.minX = selection.getMinimumPoint().x();
+  public int maxY;
-		this.minY = selection.getMinimumPoint().y();
+  public int maxZ;
-		this.minZ = selection.getMinimumPoint().z();
-		this.maxX = selection.getMaximumPoint().x();
-		this.maxY = selection.getMaximumPoint().y();
-		this.maxZ = selection.getMaximumPoint().z();
-	}
 
-	public BlockVector3 getMin(){
+  public int getId() {
-		return BlockVector3.at(minX, minY, minZ);
+    return id;
-	}
+  }
-	
-	public BlockVector3 getMax(){
-		return BlockVector3.at(maxX, maxY, maxZ);
-	}
 
-	@Override
+  public void setId(int id) {
-	public int compareTo(Cuboid o) {
+    this.id = id;
-		BlockVector3 min = getMin();
+  }
-		BlockVector3 otherMin = o.getMin();
-		
-		if(min.x() < otherMin.x()){
-			return -1;
-		}else if(min.x() > otherMin.x()){
-			return 1;
-		}else if(min.z() < otherMin.z()){
-			return -1;
-		}else if(min.z() > otherMin.z()){
-			return 1;
-		}else if(min.y() < otherMin.y()){
-			return -1;
-		}else if(min.y() > otherMin.y()){
-			return 1;
-		}else{
-			return 0;
-		}
-	}
 
-	public static int compareBlockVectors(BlockVector3 v1, BlockVector3 v2){
+  public Cuboid(int minX, int minY, int minZ, int maxX, int maxY, int maxZ) {
-		if(v1 == null){
+    this.minX = minX;
-			if(v2 == null){
+    this.minY = minY;
-				return 0;
+    this.minZ = minZ;
-			}else{
+    this.maxX = maxX;
-				return -1;
+    this.maxY = maxY;
-			}
+    this.maxZ = maxZ;
-		}else if(v2 == null){
+  }
-			return 1;
-		}
-		if(v1.x() < v2.x()){
-			return -1;
-		}else if(v1.x() > v2.x()){
-			return 1;
-		}else if(v1.z() < v2.z()){
-			return -1;
-		}else if(v1.z() > v2.z()){
-			return 1;
-		}else if(v1.y() < v2.y()){
-			return -1;
-		}else if(v1.y() > v2.y()){
-			return 1;
-		}else{
-			return 0;
-		}
-	}
-	
-	public static boolean isBlockLessThan(BlockVector3 v1, BlockVector3 v2) {
-		return compareBlockVectors(v1, v2) < 0;
-	}
-	
-	public Cuboid inset(int amount){
-		return inset(amount, amount, amount);
-	}
-	
-	public Cuboid inset(int x, int z){
-		return inset(x, 0, z);
-	}
-	
-	public Cuboid inset(int x, int y, int z){
-		return new Cuboid(this.minX + x, this.minY, this.minZ + z, this.maxX - x, this.maxY, this.maxZ - z);
-	}
 
-	public int getVolume() {
+  public Cuboid(BlockVector3 min, BlockVector3 max) {
-		return (this.maxX - this.minX) * (this.maxY - this.minY) * (this.maxZ - this.minZ);
+    this.minX = min.x();
-	}
+    this.minY = min.y();
-	public int getMinX(){return minX;}
+    this.minZ = min.z();
-	public void setMinX(int minX){this.minX = minX;}
+    this.maxX = max.x();
-	public int getMinY(){return minY;}
+    this.maxY = max.y();
-	public void setMinY(int minY){this.minY = minY;}
+    this.maxZ = max.z();
-	public int getMinZ(){return minZ;}
+  }
-	public void setMinZ(int minZ){this.minZ = minZ;}
-	public int getMaxX(){return maxX;}
-	public void setMaxX(int maxX){this.maxX = maxX;}
-	public int getMaxY(){return maxY;}
-	public void setMaxY(int maxY){this.maxY = maxY;}
-	public int getMaxZ(){return maxZ;}
-	public void setMaxZ(int maxZ){this.maxZ = maxZ;}
 
-	public Cuboid outset(int amount) {
+  public Cuboid() {
-		return outset(amount, amount, amount);
+    this.minX = 0;
-	}
+    this.minY = 0;
+    this.minZ = 0;
+    this.maxX = 0;
+    this.maxY = 0;
+    this.maxZ = 0;
+  }
 
-	public Cuboid outset(int x, int z){
+  public Cuboid(Region selection) {
-		return outset(x, 0, z);
+    this.minX = selection.getMinimumPoint().x();
-	}
+    this.minY = selection.getMinimumPoint().y();
-	
+    this.minZ = selection.getMinimumPoint().z();
-	public Cuboid outset(int x, int y, int z) {
+    this.maxX = selection.getMaximumPoint().x();
-		return new Cuboid(this.minX - x, this.minY - y, this.minZ - z, this.maxX + x, this.maxY + y, this.maxZ + z);
+    this.maxY = selection.getMaximumPoint().y();
-	}
+    this.maxZ = selection.getMaximumPoint().z();
-	
+  }
-	public int getCenterX(){
-		return (this.minX + this.maxX) /2;
-	}
-	
-	public int getCenterY(){
-		return (this.minY + this.maxY)/2;
-	}
-	
-	public int getCenterZ(){
-		return (this.minZ + this.maxZ)/2;
-	}
 
-	public boolean intersects(Cuboid other) {
+  public BlockVector3 getMin() {
-		if (this.maxX >= other.minX && this.minX <= other.maxX)
+    return BlockVector3.at(minX, minY, minZ);
-        {
+  }
-            if (this.maxZ >= other.minZ && this.minZ <= other.maxZ)
+
-            {
+  public BlockVector3 getMax() {
-                if (this.maxY >= other.minY && this.minY <= other.maxY)
+    return BlockVector3.at(maxX, maxY, maxZ);
-                {
+  }
-                    return true;
+
-                }
+  @Override
-                else
+  public int compareTo(Cuboid o) {
-                {
+    BlockVector3 min = getMin();
-                    return false;
+    BlockVector3 otherMin = o.getMin();
-                }
+
-            }
+    if (min.x() < otherMin.x()) {
-            else
+      return -1;
-            {
+    } else if (min.x() > otherMin.x()) {
-                return false;
+      return 1;
-            }
+    } else if (min.z() < otherMin.z()) {
+      return -1;
+    } else if (min.z() > otherMin.z()) {
+      return 1;
+    } else if (min.y() < otherMin.y()) {
+      return -1;
+    } else if (min.y() > otherMin.y()) {
+      return 1;
+    } else {
+      return 0;
+    }
+  }
+
+  public static int compareBlockVectors(BlockVector3 v1, BlockVector3 v2) {
+    if (v1 == null) {
+      if (v2 == null) {
+        return 0;
+      } else {
+        return -1;
+      }
+    } else if (v2 == null) {
+      return 1;
+    }
+    if (v1.x() < v2.x()) {
+      return -1;
+    } else if (v1.x() > v2.x()) {
+      return 1;
+    } else if (v1.z() < v2.z()) {
+      return -1;
+    } else if (v1.z() > v2.z()) {
+      return 1;
+    } else if (v1.y() < v2.y()) {
+      return -1;
+    } else if (v1.y() > v2.y()) {
+      return 1;
+    } else {
+      return 0;
+    }
+  }
+
+  public static boolean isBlockLessThan(BlockVector3 v1, BlockVector3 v2) {
+    return compareBlockVectors(v1, v2) < 0;
+  }
+
+  public Cuboid inset(int amount) {
+    return inset(amount, amount, amount);
+  }
+
+  public Cuboid inset(int x, int z) {
+    return inset(x, 0, z);
+  }
+
+  public Cuboid inset(int x, int y, int z) {
+    return new Cuboid(
+        this.minX + x, this.minY, this.minZ + z, this.maxX - x, this.maxY, this.maxZ - z);
+  }
+
+  public int getVolume() {
+    return (this.maxX - this.minX) * (this.maxY - this.minY) * (this.maxZ - this.minZ);
+  }
+
+  public int getMinX() {
+    return minX;
+  }
+
+  public void setMinX(int minX) {
+    this.minX = minX;
+  }
+
+  public int getMinY() {
+    return minY;
+  }
+
+  public void setMinY(int minY) {
+    this.minY = minY;
+  }
+
+  public int getMinZ() {
+    return minZ;
+  }
+
+  public void setMinZ(int minZ) {
+    this.minZ = minZ;
+  }
+
+  public int getMaxX() {
+    return maxX;
+  }
+
+  public void setMaxX(int maxX) {
+    this.maxX = maxX;
+  }
+
+  public int getMaxY() {
+    return maxY;
+  }
+
+  public void setMaxY(int maxY) {
+    this.maxY = maxY;
+  }
+
+  public int getMaxZ() {
+    return maxZ;
+  }
+
+  public void setMaxZ(int maxZ) {
+    this.maxZ = maxZ;
+  }
+
+  public Cuboid outset(int amount) {
+    return outset(amount, amount, amount);
+  }
+
+  public Cuboid outset(int x, int z) {
+    return outset(x, 0, z);
+  }
+
+  public Cuboid outset(int x, int y, int z) {
+    return new Cuboid(
+        this.minX - x, this.minY - y, this.minZ - z, this.maxX + x, this.maxY + y, this.maxZ + z);
+  }
+
+  public int getCenterX() {
+    return (this.minX + this.maxX) / 2;
+  }
+
+  public int getCenterY() {
+    return (this.minY + this.maxY) / 2;
+  }
+
+  public int getCenterZ() {
+    return (this.minZ + this.maxZ) / 2;
+  }
+
+  public boolean intersects(Cuboid other) {
+    if (this.maxX >= other.minX && this.minX <= other.maxX) {
+      if (this.maxZ >= other.minZ && this.minZ <= other.maxZ) {
+        if (this.maxY >= other.minY && this.minY <= other.maxY) {
+          return true;
+        } else {
+          return false;
         }
-        else
+      } else {
-        {
+        return false;
-            return false;
+      }
-        }
+    } else {
-	}
+      return false;
+    }
+  }
 
-	public boolean contains(Location bedSpawn) {
+  public boolean contains(Location bedSpawn) {
-		if(this.minX > bedSpawn.getBlockX() || this.maxX < bedSpawn.getBlockX()){
+    if (this.minX > bedSpawn.getBlockX() || this.maxX < bedSpawn.getBlockX()) {
-			return false;
+      return false;
-		}else if(this.minZ > bedSpawn.getBlockZ() || this.maxZ < bedSpawn.getBlockZ()){
+    } else if (this.minZ > bedSpawn.getBlockZ() || this.maxZ < bedSpawn.getBlockZ()) {
-			return false;
+      return false;
-		}else if(this.minY > bedSpawn.getBlockY() || this.maxY < bedSpawn.getBlockY()){
+    } else if (this.minY > bedSpawn.getBlockY() || this.maxY < bedSpawn.getBlockY()) {
-			return false;
+      return false;
-		}
+    }
-		
-		return true;
-	}
 
-	@Override
+    return true;
-	public String toString() {
+  }
-		return String.format("{Cuboid minX=%d, minY=%d, minZ=%d, maxX=%d, maxY=%d, maxZ=%d}", minX, minY, minZ, maxX, maxY, maxZ);
+
-	}
+  @Override
-	
+  public String toString() {
-	
+    return String.format(
+        "{Cuboid minX=%d, minY=%d, minZ=%d, maxX=%d, maxY=%d, maxZ=%d}",
+        minX, minY, minZ, maxX, maxY, maxZ);
+  }
 }

src/main/java/com/majinnaibu/bukkitplugins/metropolis/CurrentHomesStore.java

@@ -1,3 +1,20 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
 import java.io.File;
@@ -11,40 +28,40 @@ import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 final class CurrentHomesStore {
-	private CurrentHomesStore() {}
+  private CurrentHomesStore() {}
 
-	static Map<UUID, Integer> load(File file, Function<String, UUID> legacyOwnerResolver)
+  static Map<UUID, Integer> load(File file, Function<String, UUID> legacyOwnerResolver)
-			throws IOException, InvalidConfigurationException {
+      throws IOException, InvalidConfigurationException {
-		Map<UUID, Integer> homesByOwner = new HashMap<>();
+    Map<UUID, Integer> homesByOwner = new HashMap<>();
-		if (!file.exists()) {
+    if (!file.exists()) {
-			return homesByOwner;
+      return homesByOwner;
-		}
+    }
 
-		YamlConfiguration yaml = new YamlConfiguration();
+    YamlConfiguration yaml = new YamlConfiguration();
-		yaml.load(file);
+    yaml.load(file);
-		for (String ownerKey : yaml.getKeys(false)) {
+    for (String ownerKey : yaml.getKeys(false)) {
-			UUID ownerId;
+      UUID ownerId;
-			try {
+      try {
-				ownerId = UUID.fromString(ownerKey);
+        ownerId = UUID.fromString(ownerKey);
-			} catch (IllegalArgumentException ex) {
+      } catch (IllegalArgumentException ex) {
-				ownerId = legacyOwnerResolver.apply(ownerKey);
+        ownerId = legacyOwnerResolver.apply(ownerKey);
-			}
+      }
-			int homeNumber = yaml.getInt(ownerKey, 0);
+      int homeNumber = yaml.getInt(ownerKey, 0);
-			if (ownerId != null && homeNumber > 0) {
+      if (ownerId != null && homeNumber > 0) {
-				homesByOwner.put(ownerId, homeNumber);
+        homesByOwner.put(ownerId, homeNumber);
-			}
+      }
-		}
+    }
-		return homesByOwner;
+    return homesByOwner;
-	}
+  }
 
-	static void save(File file, Map<UUID, Integer> homesByOwner) throws IOException {
+  static void save(File file, Map<UUID, Integer> homesByOwner) throws IOException {
-		File parent = file.getParentFile();
+    File parent = file.getParentFile();
-		if (parent != null) {
+    if (parent != null) {
-			parent.mkdirs();
+      parent.mkdirs();
-		}
+    }
 
-		YamlConfiguration yaml = new YamlConfiguration();
+    YamlConfiguration yaml = new YamlConfiguration();
-		homesByOwner.forEach((ownerId, homeNumber) -> yaml.set(ownerId.toString(), homeNumber));
+    homesByOwner.forEach((ownerId, homeNumber) -> yaml.set(ownerId.toString(), homeNumber));
-		yaml.save(file);
+    yaml.save(file);
-	}
+  }
-}
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/HomeNumberAllocator.java

@@ -0,0 +1,41 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
+package com.majinnaibu.bukkitplugins.metropolis;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public final class HomeNumberAllocator {
+  private HomeNumberAllocator() {}
+
+  public static int nextHomeNumber(List<Plot> plots) {
+    Set<Integer> allocatedNumbers = new HashSet<>();
+    for (Plot plot : plots) {
+      if (plot instanceof PlayerHome home) {
+        allocatedNumbers.add(home.getNumber());
+      }
+    }
+
+    int nextHomeNumber = 1;
+    while (allocatedNumbers.contains(nextHomeNumber)) {
+      nextHomeNumber++;
+    }
+    return nextHomeNumber;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/HomePermissionOverride.java

@@ -0,0 +1,154 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
+package com.majinnaibu.bukkitplugins.metropolis;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+public final class HomePermissionOverride {
+  private final String _permission;
+  private final int _priority;
+  private final int _plotMultiplier;
+  private final int _maxPlots;
+
+  private HomePermissionOverride(
+      String permission, int priority, int plotMultiplier, int maxPlots) {
+    _permission = permission;
+    _priority = priority;
+    _plotMultiplier = plotMultiplier;
+    _maxPlots = maxPlots;
+  }
+
+  public String getPermission() {
+    return _permission;
+  }
+
+  public int getPriority() {
+    return _priority;
+  }
+
+  public int getPlotMultiplier() {
+    return _plotMultiplier;
+  }
+
+  public int getMaxPlots() {
+    return _maxPlots;
+  }
+
+  public static List<HomePermissionOverride> load(
+      ConfigurationSection section, Consumer<String> warningLogger) {
+    if (section == null) {
+      return List.of();
+    }
+
+    List<HomePermissionOverride> overrides = new ArrayList<>();
+    collect(section, "", overrides, warningLogger);
+    return List.copyOf(overrides);
+  }
+
+  private static void collect(
+      ConfigurationSection section,
+      String permissionPrefix,
+      List<HomePermissionOverride> overrides,
+      Consumer<String> warningLogger) {
+    for (Map.Entry<String, Object> entry : section.getValues(false).entrySet()) {
+      String permission =
+          permissionPrefix.isEmpty() ? entry.getKey() : permissionPrefix + "." + entry.getKey();
+      Map<?, ?> values = getValues(entry.getValue());
+      if (values != null && !hasRuleValues(values)) {
+        collect((ConfigurationSection) entry.getValue(), permission, overrides, warningLogger);
+        continue;
+      }
+
+      if (permission.isBlank()
+          || values == null
+          || !(values.get("priority") instanceof Number priority)
+          || !(values.get("plotMultiplier") instanceof Number plotMultiplier)
+          || !(values.get("maxPlots") instanceof Number maxPlots)
+          || priority.intValue() != priority.doubleValue()
+          || plotMultiplier.intValue() != plotMultiplier.doubleValue()
+          || maxPlots.intValue() != maxPlots.doubleValue()
+          || plotMultiplier.intValue() < 1
+          || maxPlots.intValue() < 0) {
+        warningLogger.accept("Ignoring invalid permissionOverrides entry '" + permission + "'.");
+        continue;
+      }
+
+      overrides.add(
+          new HomePermissionOverride(
+              permission, priority.intValue(), plotMultiplier.intValue(), maxPlots.intValue()));
+    }
+  }
+
+  private static boolean hasRuleValues(Map<?, ?> values) {
+    return values.containsKey("priority")
+        || values.containsKey("plotMultiplier")
+        || values.containsKey("maxPlots");
+  }
+
+  public static HomePermissionOverride findMatch(
+      List<HomePermissionOverride> overrides, Predicate<String> hasPermission) {
+    HomePermissionOverride match = null;
+    for (HomePermissionOverride override : overrides) {
+      if (hasPermission.test(override.getPermission())
+          && (match == null || override.getPriority() >= match.getPriority())) {
+        match = override;
+      }
+    }
+    return match;
+  }
+
+  public static int resolveMaxPlots(
+      UserOverride userOverride,
+      List<HomePermissionOverride> overrides,
+      Predicate<String> hasPermission,
+      int fallback) {
+    if (userOverride != null) {
+      return userOverride.getMaxPlots();
+    }
+    HomePermissionOverride match = findMatch(overrides, hasPermission);
+    return match == null ? fallback : match.getMaxPlots();
+  }
+
+  public static int resolvePlotMultiplier(
+      UserOverride userOverride,
+      List<HomePermissionOverride> overrides,
+      Predicate<String> hasPermission,
+      int fallback) {
+    if (userOverride != null) {
+      return userOverride.getPlotMultiplier();
+    }
+    HomePermissionOverride match = findMatch(overrides, hasPermission);
+    return match == null ? fallback : match.getPlotMultiplier();
+  }
+
+  private static Map<?, ?> getValues(Object value) {
+    if (value instanceof ConfigurationSection section) {
+      return section.getValues(false);
+    }
+    if (value instanceof Map<?, ?> map) {
+      return map;
+    }
+    return null;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/PlayerHome.java

@@ -1,107 +1,144 @@
-package com.majinnaibu.bukkitplugins.metropolis;
+/*
-
+This file is part of Metropolis.
-import java.util.Set;
+
-import java.util.UUID;
+Metropolis is free software: you can redistribute it and/or modify
-
+it under the terms of the GNU Affero General Public License as published by
-import org.bukkit.Bukkit;
+the Free Software Foundation, either version 3 of the License, or
-import org.bukkit.OfflinePlayer;
+(at your option) any later version.
-
+
-import com.sk89q.worldedit.math.BlockVector3;
+Metropolis is distributed in the hope that it will be useful,
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-
+GNU Affero General Public License for more details.
-public class PlayerHome extends Plot{
+
-	private UUID playerId;
+You should have received a copy of the GNU Affero General Public License
-	private String playerName;
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	public UUID getPlayerId(){return this.playerId;}
+*/
-	public String getPlayerName(){return this.playerName;}
+
-	public void setPlayerName(String playerName){this.playerName = playerName;}
+package com.majinnaibu.bukkitplugins.metropolis;
-	
+
-	private int number;
+import java.util.Set;
-		
+import java.util.UUID;
-	public PlayerHome(UUID ownerId, String ownerName, int homeNumber, BlockVector3 min, BlockVector3 max) {
+
-		super(String.format("h_%d_%s", homeNumber, ownerId), min, max);
+import com.sk89q.worldedit.math.BlockVector3;
-		this.playerId = ownerId;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-		this.playerName = ownerName;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-		this.number = homeNumber;
+
-	}
+import org.bukkit.Bukkit;
-	
+import org.bukkit.OfflinePlayer;
-	public PlayerHome() {
+
-		this.playerId = null;
+public class PlayerHome extends Plot {
-		this.playerName = "";
+  private UUID playerId;
-	}
+  private String playerName;
-	
+
-	public PlayerHome(ProtectedRegion homeRegion){
+  public UUID getPlayerId() {
-		String regionName = homeRegion.getId();
+    return this.playerId;
-		if (!regionName.startsWith("h_")) {
+  }
-			throw new IllegalArgumentException("Not a Metropolis home region: " + regionName);
+
-		}
+  public String getPlayerName() {
-		String regionOwner = regionName.substring(2);
+    return this.playerName;
-		int separator = regionOwner.indexOf('_');
+  }
-		if (separator > 0) {
+
-			try {
+  public void setPlayerName(String playerName) {
-				this.number = Integer.parseInt(regionOwner.substring(0, separator));
+    this.playerName = playerName;
-				regionOwner = regionOwner.substring(separator + 1);
+  }
-			} catch (NumberFormatException ex) {
+
-				this.number = 1;
+  private int number;
-			}
+
-		} else {
+  public PlayerHome(
-			this.number = 1;
+      UUID ownerId, String ownerName, int homeNumber, BlockVector3 min, BlockVector3 max) {
-		}
+    super(String.format("h_%d_%s", homeNumber, ownerId), min, max);
-		try {
+    this.playerId = ownerId;
-			this.playerId = UUID.fromString(regionOwner);
+    this.playerName = ownerName;
-			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
+    this.number = homeNumber;
-			this.playerName = offlinePlayer.getName() == null ? regionOwner : offlinePlayer.getName();
+  }
-		} catch (IllegalArgumentException ex) {
+
-			Set<UUID> ownerIds = homeRegion.getOwners().getUniqueIds();
+  public PlayerHome() {
-			this.playerId = ownerIds.isEmpty()
+    this.playerId = null;
-					? Bukkit.getOfflinePlayer(regionOwner).getUniqueId()
+    this.playerName = "";
-					: ownerIds.iterator().next();
+  }
-			this.playerName = regionOwner;
+
-		}
+  public PlayerHome(ProtectedRegion homeRegion) {
-		setCuboid(new Cuboid(homeRegion.getMinimumPoint(), homeRegion.getMaximumPoint()));
+    String regionName = homeRegion.getId();
-	}
+    if (!regionName.startsWith("h_")) {
-
+      throw new IllegalArgumentException("Not a Metropolis home region: " + regionName);
-	@Override
+    }
-	public boolean equals(Object other) {
+    String regionOwner = regionName.substring(2);
-		if(!(other instanceof PlayerHome)){
+    int separator = regionOwner.indexOf('_');
-			return super.equals(other);
+    if (separator > 0) {
-		}
+      try {
-		
+        this.number = Integer.parseInt(regionOwner.substring(0, separator));
-		PlayerHome otherPlayerHome = (PlayerHome)other;
+        regionOwner = regionOwner.substring(separator + 1);
-		
+      } catch (NumberFormatException ex) {
-		if(!java.util.Objects.equals(this.playerId, otherPlayerHome.playerId)){
+        this.number = 1;
-			return false;
+      }
-		}
+    } else {
-		
+      this.number = 1;
-		if(!getCuboid().equals(otherPlayerHome.getCuboid())){
+    }
-			return false;
+    try {
-		}
+      this.playerId = UUID.fromString(regionOwner);
-		
+      OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerId);
-		return true;
+      this.playerName = offlinePlayer.getName() == null ? regionOwner : offlinePlayer.getName();
-	}
+    } catch (IllegalArgumentException ex) {
-
+      Set<UUID> ownerIds = homeRegion.getOwners().getUniqueIds();
-	public String toFriendlyString() {
+      this.playerId =
-		StringBuilder sb = new StringBuilder();
+          ownerIds.isEmpty()
-		
+              ? Bukkit.getOfflinePlayer(regionOwner).getUniqueId()
-		sb.append(String.format("Metropolis Home {Owner: %s min: (%d, %d, %d) max: (%d, %d, %d)}", getPlayerName(), getCuboid().getMinX(), getCuboid().getMinY(), getCuboid().getMinZ(), getCuboid().getMaxX(), getCuboid().getMaxY(), getCuboid().getMaxZ()));
+              : ownerIds.iterator().next();
-		
+      this.playerName = regionOwner;
-		return sb.toString();
+    }
-	}
+    setCuboid(new Cuboid(homeRegion.getMinimumPoint(), homeRegion.getMaximumPoint()));
-	
+  }
-	public static PlayerHome get(ProtectedRegion homeRegion){
+
-		if(homeRegion instanceof ProtectedCuboidRegion){
+  @Override
-			return new PlayerHome((ProtectedCuboidRegion) homeRegion);
+  public boolean equals(Object other) {
-		}else{
+    if (!(other instanceof PlayerHome)) {
-			return null;
+      return super.equals(other);
-		}
+    }
-	}
+
-	
+    PlayerHome otherPlayerHome = (PlayerHome) other;
-	public Integer getNumber() {
+
-		return number;
+    if (!java.util.Objects.equals(this.playerId, otherPlayerHome.playerId)) {
-	}
+      return false;
-	
+    }
-	public void setNumber(int number){
+
-		this.number = number;
+    if (!getCuboid().equals(otherPlayerHome.getCuboid())) {
-	}
+      return false;
-}
+    }
+
+    return true;
+  }
+
+  public String toFriendlyString() {
+    StringBuilder sb = new StringBuilder();
+
+    sb.append(
+        String.format(
+            "Metropolis Home {Owner: %s min: (%d, %d, %d) max: (%d, %d, %d)}",
+            getPlayerName(),
+            getCuboid().getMinX(),
+            getCuboid().getMinY(),
+            getCuboid().getMinZ(),
+            getCuboid().getMaxX(),
+            getCuboid().getMaxY(),
+            getCuboid().getMaxZ()));
+
+    return sb.toString();
+  }
+
+  public static PlayerHome get(ProtectedRegion homeRegion) {
+    if (homeRegion instanceof ProtectedCuboidRegion) {
+      return new PlayerHome((ProtectedCuboidRegion) homeRegion);
+    } else {
+      return null;
+    }
+  }
+
+  public Integer getNumber() {
+    return number;
+  }
+
+  public void setNumber(int number) {
+    this.number = number;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/PlayerLookup.java

@@ -1,19 +1,36 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
 import org.bukkit.entity.Player;
 
 final class PlayerLookup {
-	private PlayerLookup() {}
+  private PlayerLookup() {}
 
-	static Player findOnline(String requestedName, Iterable<? extends Player> onlinePlayers) {
+  static Player findOnline(String requestedName, Iterable<? extends Player> onlinePlayers) {
-		if (requestedName == null) {
+    if (requestedName == null) {
-			return null;
+      return null;
-		}
+    }
-		for (Player player : onlinePlayers) {
+    for (Player player : onlinePlayers) {
-			if (requestedName.equalsIgnoreCase(player.getName())) {
+      if (requestedName.equalsIgnoreCase(player.getName())) {
-				return player;
+        return player;
-			}
+      }
-		}
+    }
-		return null;
+    return null;
-	}
+  }
-}
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/Plot.java

@@ -1,119 +1,164 @@
-package com.majinnaibu.bukkitplugins.metropolis;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.Location;
+
-import org.bukkit.Material;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.World;
+it under the terms of the GNU Affero General Public License as published by
-import org.bukkit.block.Block;
+the Free Software Foundation, either version 3 of the License, or
-
+(at your option) any later version.
-import com.sk89q.worldedit.math.BlockVector3;
+
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+Metropolis is distributed in the hope that it will be useful,
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-public class Plot implements Comparable<Plot>{
+GNU Affero General Public License for more details.
-	private int _id;
+
-	public int getId(){return _id;}
+You should have received a copy of the GNU Affero General Public License
-	public void setId(int id){_id = id;}
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	
+*/
-	private Cuboid _cuboid;
+
-	public Cuboid getCuboid(){return _cuboid;}
+package com.majinnaibu.bukkitplugins.metropolis;
-	public void setCuboid(Cuboid cuboid){_cuboid = cuboid;}
+
-
+import com.sk89q.worldedit.math.BlockVector3;
-	private String _regionName;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-	public String getRegionName(){return _regionName;}
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-	public void setRegionName(String regionName){_regionName = regionName;}
+
-	
+import org.bukkit.Location;
-	public Plot(String regionName, BlockVector3 min, BlockVector3 max){
+import org.bukkit.Material;
-		_cuboid = new Cuboid(min, max);
+import org.bukkit.World;
-		_regionName = regionName;
+import org.bukkit.block.Block;
-	}
+
-	
+public class Plot implements Comparable<Plot> {
-	public Plot(ProtectedCuboidRegion cuboid){
+  private int _id;
-		_cuboid = new Cuboid(cuboid.getMinimumPoint(), cuboid.getMaximumPoint());
+
-		_regionName = cuboid.getId();
+  public int getId() {
-	}
+    return _id;
-	
+  }
-	public Plot(){
+
-		_cuboid = new Cuboid();
+  public void setId(int id) {
-		_regionName = "";
+    _id = id;
-	}
+  }
-
+
-	public BlockVector3 getPlotMin(int roadWidth) {
+  private Cuboid _cuboid;
-		return BlockVector3.at(_cuboid.minX - roadWidth/2, _cuboid.minY, _cuboid.minZ - roadWidth/2);
+
-	}
+  public Cuboid getCuboid() {
-	
+    return _cuboid;
-	public int getRow(int roadWidth, int plotSizeZ){
+  }
-		BlockVector3 min = getPlotMin(roadWidth);
+
-		return min.z() / plotSizeZ;
+  public void setCuboid(Cuboid cuboid) {
-	}
+    _cuboid = cuboid;
-	
+  }
-	public int getCol(int roadWidth, int plotSizeX){
+
-		return getPlotMin(roadWidth).x() / plotSizeX;
+  private String _regionName;
-	}
+
-	
+  public String getRegionName() {
-	@Override
+    return _regionName;
-	public boolean equals(Object other) {
+  }
-		if(!(other instanceof Plot)){
+
-			return super.equals(other);
+  public void setRegionName(String regionName) {
-		}
+    _regionName = regionName;
-		
+  }
-		Plot otherPlayerHome = (Plot)other;
+
-		
+  public Plot(String regionName, BlockVector3 min, BlockVector3 max) {
-		if(!getCuboid().equals(otherPlayerHome.getCuboid())){
+    _cuboid = new Cuboid(min, max);
-			return false;
+    _regionName = regionName;
-		}
+  }
-		
+
-		return true;
+  public Plot(ProtectedCuboidRegion cuboid) {
-	}
+    _cuboid = new Cuboid(cuboid.getMinimumPoint(), cuboid.getMaximumPoint());
-
+    _regionName = cuboid.getId();
-	@Override
+  }
-	public int compareTo(Plot another) {
+
-		return getCuboid().compareTo(another.getCuboid());
+  public Plot() {
-	}
+    _cuboid = new Cuboid();
-
+    _regionName = "";
-	@Override
+  }
-	public String toString(){
+
-		StringBuilder sb = new StringBuilder();
+  public BlockVector3 getPlotMin(int roadWidth) {
-		
+    return BlockVector3.at(
-		sb.append(String.format("{PlayerHome }"));
+        _cuboid.minX - roadWidth / 2, _cuboid.minY, _cuboid.minZ - roadWidth / 2);
-		
+  }
-		return sb.toString();
+
-	}
+  public int getRow(int roadWidth, int plotSizeZ) {
-	
+    BlockVector3 min = getPlotMin(roadWidth);
-	public static Plot get(ProtectedRegion region){
+    return min.z() / plotSizeZ;
-		if(region instanceof ProtectedCuboidRegion){
+  }
-			return new Plot((ProtectedCuboidRegion) region);
+
-		}else{
+  public int getCol(int roadWidth, int plotSizeX) {
-			return null;
+    return getPlotMin(roadWidth).x() / plotSizeX;
-		}
+  }
-	}
+
-	
+  @Override
-	public String toFriendlyString() {
+  public boolean equals(Object other) {
-		StringBuilder sb = new StringBuilder();
+    if (!(other instanceof Plot)) {
-		
+      return super.equals(other);
-		sb.append(String.format("Metropolis Reserved Plot {min: (%d, %d, %d) max: (%d, %d, %d)}", getCuboid().getMinX(), getCuboid().getMinY(), getCuboid().getMinZ(), getCuboid().getMaxX(), getCuboid().getMaxY(), getCuboid().getMaxZ()));
+    }
-		
+
-		return sb.toString();
+    Plot otherPlayerHome = (Plot) other;
-	}
+
-	
+    if (!getCuboid().equals(otherPlayerHome.getCuboid())) {
-	public boolean contains(Location bedSpawn) {
+      return false;
-		return _cuboid.contains(bedSpawn);
+    }
-	}
+
-	
+    return true;
-	public Location getViableSpawnLocation(World world) {
+  }
-		Cuboid cuboid = getCuboid();
+
-		for(int y=cuboid.maxY-1; y>= cuboid.minY; y--){
+  @Override
-			for(int x=cuboid.minX; x<= cuboid.maxX; x++){
+  public int compareTo(Plot another) {
-				for(int z=cuboid.minZ; z<= cuboid.maxZ; z++){
+    return getCuboid().compareTo(another.getCuboid());
-					Block block = world.getBlockAt(x, y, z);
+  }
-					Block blockAbove = world.getBlockAt(x, y+1, z);
+
-					Block blockUnder = world.getBlockAt(x, y-1, z);
+  @Override
-					if(block.getType() == Material.AIR & blockAbove.getType() == Material.AIR && blockUnder.getType() != Material.AIR){
+  public String toString() {
-						return new Location(world, x, y, z);
+    StringBuilder sb = new StringBuilder();
-					}
+
-				}
+    sb.append(String.format("{PlayerHome }"));
-			}
+
-		}
+    return sb.toString();
-		
+  }
-		return null;
+
-	}
+  public static Plot get(ProtectedRegion region) {
-}
+    if (region instanceof ProtectedCuboidRegion) {
+      return new Plot((ProtectedCuboidRegion) region);
+    } else {
+      return null;
+    }
+  }
+
+  public String toFriendlyString() {
+    StringBuilder sb = new StringBuilder();
+
+    sb.append(
+        String.format(
+            "Metropolis Reserved Plot {min: (%d, %d, %d) max: (%d, %d, %d)}",
+            getCuboid().getMinX(),
+            getCuboid().getMinY(),
+            getCuboid().getMinZ(),
+            getCuboid().getMaxX(),
+            getCuboid().getMaxY(),
+            getCuboid().getMaxZ()));
+
+    return sb.toString();
+  }
+
+  public boolean contains(Location bedSpawn) {
+    return _cuboid.contains(bedSpawn);
+  }
+
+  public Location getViableSpawnLocation(World world) {
+    Cuboid cuboid = getCuboid();
+    for (int y = cuboid.maxY - 1; y >= cuboid.minY; y--) {
+      for (int x = cuboid.minX; x <= cuboid.maxX; x++) {
+        for (int z = cuboid.minZ; z <= cuboid.maxZ; z++) {
+          Block block = world.getBlockAt(x, y, z);
+          Block blockAbove = world.getBlockAt(x, y + 1, z);
+          Block blockUnder = world.getBlockAt(x, y - 1, z);
+          if (block.getType() == Material.AIR & blockAbove.getType() == Material.AIR
+              && blockUnder.getType() != Material.AIR) {
+            return new Location(world, x, y, z);
+          }
+        }
+      }
+    }
+
+    return null;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/UserOverride.java

@@ -1,17 +1,42 @@
-package com.majinnaibu.bukkitplugins.metropolis;
+/*
-
+This file is part of Metropolis.
-public class UserOverride {
+
-	private String _username;
+Metropolis is free software: you can redistribute it and/or modify
-	private int _plotMultiplier;
+it under the terms of the GNU Affero General Public License as published by
-	private int _maxPlots;
+the Free Software Foundation, either version 3 of the License, or
-	
+(at your option) any later version.
-	public String getUsername(){return _username;}
+
-	public int getPlotMultiplier(){return _plotMultiplier;}
+Metropolis is distributed in the hope that it will be useful,
-	public int getMaxPlots(){return _maxPlots;}
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-	
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	public UserOverride(String username, int plotMultiplier, int maxPlots){
+GNU Affero General Public License for more details.
-		_username = username;
+
-		_plotMultiplier = plotMultiplier;
+You should have received a copy of the GNU Affero General Public License
-		_maxPlots = maxPlots;
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	}
+*/
-}
+
+package com.majinnaibu.bukkitplugins.metropolis;
+
+public class UserOverride {
+  private String _username;
+  private int _plotMultiplier;
+  private int _maxPlots;
+
+  public String getUsername() {
+    return _username;
+  }
+
+  public int getPlotMultiplier() {
+    return _plotMultiplier;
+  }
+
+  public int getMaxPlots() {
+    return _maxPlots;
+  }
+
+  public UserOverride(String username, int plotMultiplier, int maxPlots) {
+    _username = username;
+    _plotMultiplier = plotMultiplier;
+    _maxPlots = maxPlots;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java

@@ -1,24 +1,40 @@
-package com.majinnaibu.bukkitplugins.metropolis.commands;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.command.Command;
+
-import org.bukkit.command.CommandExecutor;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.command.CommandSender;
+it under the terms of the GNU Affero General Public License as published by
-
+the Free Software Foundation, either version 3 of the License, or
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+(at your option) any later version.
-
+
-public class MetropolisCommand implements CommandExecutor {
+Metropolis is distributed in the hope that it will be useful,
-	private MetropolisPlugin _plugin;
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-	
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	public MetropolisCommand(MetropolisPlugin plugin){
+GNU Affero General Public License for more details.
-		_plugin = plugin;
+
-	}
+You should have received a copy of the GNU Affero General Public License
-	
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	@Override
+*/
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+
-		
+package com.majinnaibu.bukkitplugins.metropolis.commands;
-		sender.sendMessage("Metropolis: version "+ _plugin.pdf.getVersion());
+
-		
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-		return true;
+
-	}
+import org.bukkit.command.Command;
-
+import org.bukkit.command.CommandExecutor;
-}
+import org.bukkit.command.CommandSender;
+
+public class MetropolisCommand implements CommandExecutor {
+  private MetropolisPlugin _plugin;
+
+  public MetropolisCommand(MetropolisPlugin plugin) {
+    _plugin = plugin;
+  }
+
+  @Override
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+
+    sender.sendMessage("Metropolis: version " + _plugin.pdf.getVersion());
+
+    return true;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisDebugGenerateTestHomesCommand.java

@@ -1,32 +1,47 @@
-package com.majinnaibu.bukkitplugins.metropolis.commands;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.command.Command;
+
-import org.bukkit.command.CommandExecutor;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.command.CommandSender;
+it under the terms of the GNU Affero General Public License as published by
-
+the Free Software Foundation, either version 3 of the License, or
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+(at your option) any later version.
-
+
-public class MetropolisDebugGenerateTestHomesCommand implements CommandExecutor {
+Metropolis is distributed in the hope that it will be useful,
-
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-	private MetropolisPlugin _plugin;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-
+GNU Affero General Public License for more details.
-	public MetropolisDebugGenerateTestHomesCommand(MetropolisPlugin plugin) {
+
-		_plugin = plugin;
+You should have received a copy of the GNU Affero General Public License
-		
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	}
+*/
-
+
-	@Override
+package com.majinnaibu.bukkitplugins.metropolis.commands;
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+
-		try{
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-			int numHomes = Integer.parseInt(args[0]);
+
-			for(int i=1; i<= numHomes; i++){
+import org.bukkit.command.Command;
-				_plugin.generateHome(String.format("test%d", i));
+import org.bukkit.command.CommandExecutor;
-			}
+import org.bukkit.command.CommandSender;
-		
+
-			return true;
+public class MetropolisDebugGenerateTestHomesCommand implements CommandExecutor {
-		}catch(NumberFormatException ex){
+
-			return false;
+  private MetropolisPlugin _plugin;
-		}
+
-	}
+  public MetropolisDebugGenerateTestHomesCommand(MetropolisPlugin plugin) {
-
+    _plugin = plugin;
-}
+  }
+
+  @Override
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    try {
+      int numHomes = Integer.parseInt(args[0]);
+      for (int i = 1; i <= numHomes; i++) {
+        _plugin.generateHome(String.format("test%d", i));
+      }
+
+      return true;
+    } catch (NumberFormatException ex) {
+      return false;
+    }
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisFlagResetCommand.java

@@ -1,53 +1,65 @@
-package com.majinnaibu.bukkitplugins.metropolis.commands;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.command.Command;
+
-import org.bukkit.command.CommandExecutor;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.command.CommandSender;
+it under the terms of the GNU Affero General Public License as published by
-
+the Free Software Foundation, either version 3 of the License, or
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+(at your option) any later version.
-import com.sk89q.worldguard.protection.flags.Flags;
+
-import com.sk89q.worldguard.protection.flags.StateFlag;
+Metropolis is distributed in the hope that it will be useful,
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-public class MetropolisFlagResetCommand implements CommandExecutor {
+GNU Affero General Public License for more details.
-	private MetropolisPlugin _plugin;
+
-
+You should have received a copy of the GNU Affero General Public License
-	public MetropolisFlagResetCommand(MetropolisPlugin plugin){
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-		_plugin = plugin;
+*/
-	}
+
-	
+package com.majinnaibu.bukkitplugins.metropolis.commands;
-	@Override
+
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-		ProtectedRegion cityRegion = _plugin.regionManager.getRegion("City");
+import com.sk89q.worldguard.protection.flags.Flags;
-		cityRegion.setFlag(Flags.PVP, StateFlag.State.DENY);
+import com.sk89q.worldguard.protection.flags.StateFlag;
-		cityRegion.setFlag(Flags.MOB_DAMAGE, StateFlag.State.DENY);
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-		cityRegion.setFlag(Flags.MOB_SPAWNING, StateFlag.State.DENY);
+
-		cityRegion.setFlag(Flags.CREEPER_EXPLOSION, StateFlag.State.DENY);
+import org.bukkit.command.Command;
-		cityRegion.setFlag(Flags.ENDER_BUILD, StateFlag.State.DENY);
+import org.bukkit.command.CommandExecutor;
-		cityRegion.setFlag(Flags.GHAST_FIREBALL, StateFlag.State.DENY);
+import org.bukkit.command.CommandSender;
-		cityRegion.setFlag(Flags.TNT, StateFlag.State.DENY);
+
-		cityRegion.setFlag(Flags.LAVA_FLOW, StateFlag.State.DENY);
+public class MetropolisFlagResetCommand implements CommandExecutor {
-		cityRegion.setFlag(Flags.SNOW_FALL, StateFlag.State.DENY);
+  private MetropolisPlugin _plugin;
-		
+
-		for(ProtectedRegion homeRegion: _plugin.regionManager.getRegions().values()){
+  public MetropolisFlagResetCommand(MetropolisPlugin plugin) {
-			if(homeRegion.getId().startsWith("h_")){
+    _plugin = plugin;
-				homeRegion.setFlag(Flags.PVP, StateFlag.State.DENY);
+  }
-				homeRegion.setFlag(Flags.MOB_DAMAGE, StateFlag.State.DENY);
+
-				homeRegion.setFlag(Flags.MOB_SPAWNING, StateFlag.State.DENY);
+  @Override
-				homeRegion.setFlag(Flags.CREEPER_EXPLOSION, StateFlag.State.DENY);
+  public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-				homeRegion.setFlag(Flags.ENDER_BUILD, StateFlag.State.DENY);
+    ProtectedRegion cityRegion = _plugin.regionManager.getRegion("City");
-				homeRegion.setFlag(Flags.GHAST_FIREBALL, StateFlag.State.DENY);
+    cityRegion.setFlag(Flags.PVP, StateFlag.State.DENY);
-				homeRegion.setFlag(Flags.TNT, StateFlag.State.DENY);
+    cityRegion.setFlag(Flags.MOB_DAMAGE, StateFlag.State.DENY);
-				
+    cityRegion.setFlag(Flags.MOB_SPAWNING, StateFlag.State.DENY);
-			}
+    cityRegion.setFlag(Flags.CREEPER_EXPLOSION, StateFlag.State.DENY);
-		}
+    cityRegion.setFlag(Flags.ENDER_BUILD, StateFlag.State.DENY);
-		
+    cityRegion.setFlag(Flags.GHAST_FIREBALL, StateFlag.State.DENY);
-		sender.sendMessage("Metropolis: flags have been reset");
+    cityRegion.setFlag(Flags.TNT, StateFlag.State.DENY);
-		
+    cityRegion.setFlag(Flags.LAVA_FLOW, StateFlag.State.DENY);
-		return true;
+    cityRegion.setFlag(Flags.SNOW_FALL, StateFlag.State.DENY);
-		
+
-		
+    for (ProtectedRegion homeRegion : _plugin.regionManager.getRegions().values()) {
-
+      if (homeRegion.getId().startsWith("h_")) {
-	}
+        homeRegion.setFlag(Flags.PVP, StateFlag.State.DENY);
-
+        homeRegion.setFlag(Flags.MOB_DAMAGE, StateFlag.State.DENY);
-}
+        homeRegion.setFlag(Flags.MOB_SPAWNING, StateFlag.State.DENY);
+        homeRegion.setFlag(Flags.CREEPER_EXPLOSION, StateFlag.State.DENY);
+        homeRegion.setFlag(Flags.ENDER_BUILD, StateFlag.State.DENY);
+        homeRegion.setFlag(Flags.GHAST_FIREBALL, StateFlag.State.DENY);
+        homeRegion.setFlag(Flags.TNT, StateFlag.State.DENY);
+      }
+    }
+
+    sender.sendMessage("Metropolis: flags have been reset");
+
+    return true;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeAcquire.java

@@ -1,35 +1,50 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.commands;
 
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-
 public class MetropolisHomeAcquire implements CommandExecutor {
-	MetropolisPlugin _plugin;
+  MetropolisPlugin _plugin;
-	
-	public MetropolisHomeAcquire(MetropolisPlugin plugin){
-		_plugin = plugin;
-	}
 
-	@Override
+  public MetropolisHomeAcquire(MetropolisPlugin plugin) {
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    _plugin = plugin;
-		if(!(sender instanceof Player)){
+  }
-			sender.sendMessage("This command can only be used by players");
-			return false;
-		}
-		
-		Player player = (Player) sender;
-		
-		if(_plugin.getNumPlots(player.getUniqueId()) >= _plugin.getMaxPlots(player.getUniqueId())){
-			sender.sendMessage("You cannot have any more plots");
-			return false;
-		}
-		
-		_plugin.assignPlot(player);
-		return true;
-	}
 
+  @Override
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    if (!(sender instanceof Player)) {
+      sender.sendMessage("This command can only be used by players");
+      return false;
+    }
+
+    Player player = (Player) sender;
+
+    if (_plugin.getNumPlots(player.getUniqueId()) >= _plugin.getMaxPlots(player)) {
+      sender.sendMessage("You cannot have any more plots");
+      return false;
+    }
+
+    return _plugin.acquireHome(player) != null;
+  }
 }

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeEvictCommand.java

@@ -1,60 +1,79 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.commands;
 
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
 public class MetropolisHomeEvictCommand implements CommandExecutor {
-	MetropolisPlugin _plugin = null;
+  MetropolisPlugin _plugin = null;
 
-	public MetropolisHomeEvictCommand(MetropolisPlugin plugin){
+  public MetropolisHomeEvictCommand(MetropolisPlugin plugin) {
-		_plugin = plugin;
+    _plugin = plugin;
-	}
+  }
-	
-	@Override
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		//get the player and region
-		String playerName = "";
-		
-		if(args.length == 0){
-			return false;
-		}
-		
-		if(args.length >= 1){
-			playerName = args[0];
-		}
-		
-		OfflinePlayer player = _plugin.getOfflinePlayer(playerName);
-		if(player == null){
-			sender.sendMessage(String.format("The requested player {%s}does not appear to exist.", playerName));
-			return false;
-		}
-		
-		ProtectedRegion region = _plugin.getRegion(_plugin.getCurrentHomeRegionName(player.getUniqueId()));
-		if(region == null){
-			sender.sendMessage(String.format("The player {%s} has no home to be evicted from."));
-			return false;
-		}
-		
-		//remove the player as owner and/or member of the region
-		region.getMembers().removePlayer(player.getUniqueId());
-		region.getOwners().removePlayer(player.getUniqueId());
-		
-		//if the region has no owners delete the region
-		if(region.getMembers().size() == 0 && region.getOwners().size() == 0){
-			_plugin.removeRegion(region.getId());
-		}
-		
-		_plugin.saveRegions();
-		
-		//?optionally regen the region
-		//_plugin.worldEdit.getCommand("regen").execute(_plugin.getServer().getConsoleSender(), "regen", new String[]{});
-		
-		return true;
-	}
 
+  @Override
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    // get the player and region
+    String playerName = "";
+
+    if (args.length == 0) {
+      return false;
+    }
+
+    if (args.length >= 1) {
+      playerName = args[0];
+    }
+
+    OfflinePlayer player = _plugin.getOfflinePlayer(playerName);
+    if (player == null) {
+      sender.sendMessage(
+          String.format("The requested player {%s}does not appear to exist.", playerName));
+      return false;
+    }
+
+    ProtectedRegion region =
+        _plugin.getRegion(_plugin.getCurrentHomeRegionName(player.getUniqueId()));
+    if (region == null) {
+      sender.sendMessage(String.format("The player {%s} has no home to be evicted from."));
+      return false;
+    }
+
+    // remove the player as owner and/or member of the region
+    region.getMembers().removePlayer(player.getUniqueId());
+    region.getOwners().removePlayer(player.getUniqueId());
+
+    // if the region has no owners delete the region
+    if (region.getMembers().size() == 0 && region.getOwners().size() == 0) {
+      _plugin.removeRegion(region.getId());
+    }
+
+    _plugin.saveRegions();
+
+    // ?optionally regen the region
+    // _plugin.worldEdit.getCommand("regen").execute(_plugin.getServer().getConsoleSender(),
+    // "regen", new String[]{});
+
+    return true;
+  }
 }

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeGenerateCommand.java

@@ -1,36 +1,52 @@
-package com.majinnaibu.bukkitplugins.metropolis.commands;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.command.Command;
+
-import org.bukkit.command.CommandExecutor;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.command.CommandSender;
+it under the terms of the GNU Affero General Public License as published by
-import org.bukkit.OfflinePlayer;
+the Free Software Foundation, either version 3 of the License, or
-
+(at your option) any later version.
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+
-
+Metropolis is distributed in the hope that it will be useful,
-public class MetropolisHomeGenerateCommand implements CommandExecutor {
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	private MetropolisPlugin _plugin;
+GNU Affero General Public License for more details.
-	
+
-	public MetropolisHomeGenerateCommand(MetropolisPlugin plugin){
+You should have received a copy of the GNU Affero General Public License
-		_plugin = plugin;
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	}
+*/
-	
+
-	@Override
+package com.majinnaibu.bukkitplugins.metropolis.commands;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
-		if(args.length < 1){
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-			return false;
+
-		}
+import org.bukkit.OfflinePlayer;
-		
+import org.bukkit.command.Command;
-		OfflinePlayer player = _plugin.getOfflinePlayer(args[0]);
+import org.bukkit.command.CommandExecutor;
-		if (player == null) {
+import org.bukkit.command.CommandSender;
-			sender.sendMessage("Unable to find player " + args[0]);
+
-			return false;
+public class MetropolisHomeGenerateCommand implements CommandExecutor {
-		}
+
-		_plugin.generateHome(player);
+  private MetropolisPlugin _plugin;
-		
+
-		sender.sendMessage("[Metropolis] Home generated for " + args[0]);
+  public MetropolisHomeGenerateCommand(MetropolisPlugin plugin) {
-		
+    _plugin = plugin;
-		return true;
+  }
-	}
+
-
+  @Override
-}
+  public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    if (args.length < 1) {
+      return false;
+    }
+
+    OfflinePlayer player = _plugin.getOfflinePlayer(args[0]);
+    if (player == null) {
+      sender.sendMessage("Unable to find player " + args[0]);
+      return false;
+    }
+    _plugin.generateHome(player);
+
+    sender.sendMessage("[Metropolis] Home generated for " + args[0]);
+
+    return true;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeGoCommand.java

@@ -1,76 +1,94 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.commands;
 
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+import com.majinnaibu.bukkitplugins.metropolis.PlayerHome;
+
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-import com.majinnaibu.bukkitplugins.metropolis.PlayerHome;
-
 public class MetropolisHomeGoCommand implements CommandExecutor {
-	MetropolisPlugin _plugin = null; 
+  MetropolisPlugin _plugin = null;
-	
-	public MetropolisHomeGoCommand(MetropolisPlugin plugin){
-		_plugin = plugin;
-	}
-	
-	@Override
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		Player player = null;
-		if(sender instanceof Player){
-			player = (Player)sender;
 
-			if(args.length >= 1){
+  public MetropolisHomeGoCommand(MetropolisPlugin plugin) {
-				if(player.hasPermission("")){
+    _plugin = plugin;
-					player = _plugin.getPlayer(args[0]);
+  }
-					
-					if(player == null){
-						sender.sendMessage(String.format("Unable to find player %s", args[0]));
-						return false;
-					}
-				}else{
-					sender.sendMessage("Permission denied");
-					return false;
-				}
-			}			
-		}else{
-			if(args.length >= 1){
-				player = _plugin.getPlayer(args[0]);
 
-				if(player == null){
+  @Override
-					sender.sendMessage(String.format("Unable to find player %s", args[0]));
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-					return false;
+    Player player = null;
-				}
+    if (sender instanceof Player) {
-			}else{
+      player = (Player) sender;
-				sender.sendMessage("You must be a player");
+
-				return false;
+      if (args.length >= 1) {
-			}
+        if (player.hasPermission("")) {
-		}
+          player = _plugin.getPlayer(args[0]);
-		
+
-		PlayerHome home = _plugin.getPlayerHome(player);
+          if (player == null) {
-		
+            sender.sendMessage(String.format("Unable to find player %s", args[0]));
-		Location loc = null;
+            return false;
-		Location bedSpawn = player.getBedSpawnLocation();
+          }
-		
+        } else {
-		if(home.contains(bedSpawn)){
+          sender.sendMessage("Permission denied");
-			loc = bedSpawn;
+          return false;
-		}else {
+        }
-			loc = home.getViableSpawnLocation(_plugin.getWorld());
+      }
-		}
+    } else {
-		
+      if (args.length >= 1) {
-		if(loc != null){
+        player = _plugin.getPlayer(args[0]);
-			player.teleport(loc);
+
-		}else{
+        if (player == null) {
-			if(sender == player){
+          sender.sendMessage(String.format("Unable to find player %s", args[0]));
-				sender.sendMessage("There is no valid spawn location in your home");
+          return false;
-			}else{
+        }
-				sender.sendMessage(String.format("There is no valid spawn location in %s's home", player.getName()));
+      } else {
-			}
+        sender.sendMessage("You must be a player");
-			return false;
+        return false;
-		}
+      }
-		
+    }
-		return true;
+
-	}
+    PlayerHome home = _plugin.getPlayerHome(player);
+
+    Location loc = null;
+    Location bedSpawn = player.getBedSpawnLocation();
+
+    if (home.contains(bedSpawn)) {
+      loc = bedSpawn;
+    } else {
+      loc = home.getViableSpawnLocation(_plugin.getWorld());
+    }
+
+    if (loc != null) {
+      player.teleport(loc);
+    } else {
+      if (sender == player) {
+        sender.sendMessage("There is no valid spawn location in your home");
+      } else {
+        sender.sendMessage(
+            String.format("There is no valid spawn location in %s's home", player.getName()));
+      }
+      return false;
+    }
+
+    return true;
+  }
 }

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeListCommand.java

@@ -1,25 +1,41 @@
-package com.majinnaibu.bukkitplugins.metropolis.commands;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.command.Command;
+
-import org.bukkit.command.CommandExecutor;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.command.CommandSender;
+it under the terms of the GNU Affero General Public License as published by
-
+the Free Software Foundation, either version 3 of the License, or
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+(at your option) any later version.
-import com.majinnaibu.bukkitplugins.metropolis.Plot;
+
-
+Metropolis is distributed in the hope that it will be useful,
-public class MetropolisHomeListCommand implements CommandExecutor {
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-	private MetropolisPlugin _plugin;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	
+GNU Affero General Public License for more details.
-	public MetropolisHomeListCommand(MetropolisPlugin plugin){
+
-		_plugin = plugin;
+You should have received a copy of the GNU Affero General Public License
-	}
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	
+*/
-	@Override
+
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+package com.majinnaibu.bukkitplugins.metropolis.commands;
-		for(Plot cityBlock : _plugin.getCityBlocks()){
+
-			sender.sendMessage(String.format("%s", cityBlock.toFriendlyString()));
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-		}
+import com.majinnaibu.bukkitplugins.metropolis.Plot;
-		return true;
+
-	}
+import org.bukkit.command.Command;
-
+import org.bukkit.command.CommandExecutor;
-}
+import org.bukkit.command.CommandSender;
+
+public class MetropolisHomeListCommand implements CommandExecutor {
+  private MetropolisPlugin _plugin;
+
+  public MetropolisHomeListCommand(MetropolisPlugin plugin) {
+    _plugin = plugin;
+  }
+
+  @Override
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    for (Plot cityBlock : _plugin.getCityBlocks()) {
+      sender.sendMessage(String.format("%s", cityBlock.toFriendlyString()));
+    }
+    return true;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeMoveCommand.java

@@ -1,53 +1,69 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.commands;
 
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-
 public class MetropolisHomeMoveCommand implements CommandExecutor {
-	MetropolisPlugin _plugin;
+  MetropolisPlugin _plugin;
 
-	public MetropolisHomeMoveCommand(MetropolisPlugin plugin) {
+  public MetropolisHomeMoveCommand(MetropolisPlugin plugin) {
-		_plugin = plugin;
+    _plugin = plugin;
-	}
+  }
 
-	@Override
+  @Override
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		OfflinePlayer player = null;
+    OfflinePlayer player = null;
-		int newHomeNumber = 0;
+    int newHomeNumber = 0;
-		
-		if(sender instanceof OfflinePlayer){
-			player = (OfflinePlayer)sender;
-		}
-		
-		if(args.length == 1){
-			try{
-				newHomeNumber = Integer.parseInt(args[0]);
-			}catch(NumberFormatException ex){
-				return false;
-			}
-		}else if(args.length >= 2){
-			try{
-				newHomeNumber = Integer.parseInt(args[0]);
-			}catch(NumberFormatException ex){
-				return false;
-			}
-			
-			player = _plugin.getOfflinePlayer(args[1]);
-		}else{
-			return false;
-		}
-		
-		if(player == null || !_plugin.homeExists(player.getUniqueId(), newHomeNumber)){
-			return false;
-		}
-		
-		_plugin.setHome(player.getUniqueId(), newHomeNumber);
-				
-		return true;
-	}
 
+    if (sender instanceof OfflinePlayer) {
+      player = (OfflinePlayer) sender;
+    }
+
+    if (args.length == 1) {
+      try {
+        newHomeNumber = Integer.parseInt(args[0]);
+      } catch (NumberFormatException ex) {
+        return false;
+      }
+    } else if (args.length >= 2) {
+      try {
+        newHomeNumber = Integer.parseInt(args[0]);
+      } catch (NumberFormatException ex) {
+        return false;
+      }
+
+      player = _plugin.getOfflinePlayer(args[1]);
+    } else {
+      return false;
+    }
+
+    if (player == null || !_plugin.homeExists(player.getUniqueId(), newHomeNumber)) {
+      return false;
+    }
+
+    _plugin.setHome(player.getUniqueId(), newHomeNumber);
+
+    return true;
+  }
 }

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotGoCommand.java

@@ -1,49 +1,65 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.commands;
 
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+import com.majinnaibu.bukkitplugins.metropolis.Plot;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-import com.majinnaibu.bukkitplugins.metropolis.Plot;
-
 public class MetropolisPlotGoCommand implements CommandExecutor {
-	MetropolisPlugin _plugin;
+  MetropolisPlugin _plugin;
 
-	public MetropolisPlotGoCommand(MetropolisPlugin plugin) {
+  public MetropolisPlotGoCommand(MetropolisPlugin plugin) {
-		_plugin = plugin;
+    _plugin = plugin;
-	}
+  }
 
-	@Override
+  @Override
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		Player player = null;
+    Player player = null;
-		Plot plot = null;
+    Plot plot = null;
-		
-		if(sender instanceof Player){
-			player = (Player) sender;
-		}
-		
-		if(args.length == 1 && player != null){
-			plot = _plugin.getPlot(args[0]);
-		}else if(args.length >= 2){
-			player = _plugin.getPlayer(args[1]);
-			plot = _plugin.getPlot(args[0]);
-		}else{
-			return false;
-		}
-		
-		if(plot == null || player == null){
-			return false;
-		}
-		
-		String errorMessage = _plugin.teleportPlayerToPlot(player, plot);
-		if(errorMessage != null){
-			sender.sendMessage(errorMessage);
-			return false;
-		}
-		
-		return true;
-	}
 
+    if (sender instanceof Player) {
+      player = (Player) sender;
+    }
+
+    if (args.length == 1 && player != null) {
+      plot = _plugin.getPlot(args[0]);
+    } else if (args.length >= 2) {
+      player = _plugin.getPlayer(args[1]);
+      plot = _plugin.getPlot(args[0]);
+    } else {
+      return false;
+    }
+
+    if (plot == null || player == null) {
+      return false;
+    }
+
+    String errorMessage = _plugin.teleportPlayerToPlot(player, plot);
+    if (errorMessage != null) {
+      sender.sendMessage(errorMessage);
+      return false;
+    }
+
+    return true;
+  }
 }

src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotReserveCommand.java

@@ -1,76 +1,95 @@
-package com.majinnaibu.bukkitplugins.metropolis.commands;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.command.Command;
+
-import org.bukkit.command.CommandExecutor;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.command.CommandSender;
+it under the terms of the GNU Affero General Public License as published by
-import org.bukkit.entity.Player;
+the Free Software Foundation, either version 3 of the License, or
-
+(at your option) any later version.
-import com.majinnaibu.bukkitplugins.metropolis.Cuboid;
+
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+Metropolis is distributed in the hope that it will be useful,
-import com.sk89q.worldedit.IncompleteRegionException;
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-import com.sk89q.worldedit.regions.Region;
+GNU Affero General Public License for more details.
-
+
-public class MetropolisPlotReserveCommand implements CommandExecutor {
+You should have received a copy of the GNU Affero General Public License
-	MetropolisPlugin _plugin;
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-
+*/
-	public MetropolisPlotReserveCommand(MetropolisPlugin metropolisPlugin) {
+
-		_plugin = metropolisPlugin;
+package com.majinnaibu.bukkitplugins.metropolis.commands;
-	}
+
-
+import com.majinnaibu.bukkitplugins.metropolis.Cuboid;
-	@Override
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+import com.sk89q.worldedit.IncompleteRegionException;
-		int minX = 0;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
-		int minY = 0;
+import com.sk89q.worldedit.regions.Region;
-		int minZ = 0;
+
-		int maxX = 0;
+import org.bukkit.command.Command;
-		int maxY = 0;
+import org.bukkit.command.CommandExecutor;
-		int maxZ = 0;
+import org.bukkit.command.CommandSender;
-		Cuboid cuboid = new Cuboid();
+import org.bukkit.entity.Player;
-		
+
-		if(sender instanceof Player && args.length == 1){
+public class MetropolisPlotReserveCommand implements CommandExecutor {
-			try {
+  MetropolisPlugin _plugin;
-				Region selection = _plugin.worldEdit.getSession((Player) sender)
+
-						.getSelection(BukkitAdapter.adapt(_plugin.getWorld()));
+  public MetropolisPlotReserveCommand(MetropolisPlugin metropolisPlugin) {
-				cuboid = new Cuboid(selection);
+    _plugin = metropolisPlugin;
-			} catch (IncompleteRegionException ex) {
+  }
-				sender.sendMessage("Select a WorldEdit region first.");
+
-				return false;
+  @Override
-			}
+  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		}else if(args.length == 7){
+    int minX = 0;
-			try{
+    int minY = 0;
-				minX = Integer.parseInt(args[1]);
+    int minZ = 0;
-				minY = Integer.parseInt(args[2]);
+    int maxX = 0;
-				minZ = Integer.parseInt(args[3]);
+    int maxY = 0;
-				maxX = Integer.parseInt(args[4]);
+    int maxZ = 0;
-				maxY = Integer.parseInt(args[5]);
+    Cuboid cuboid = new Cuboid();
-				maxZ = Integer.parseInt(args[6]);
+
-			}catch(NumberFormatException ex){
+    if (sender instanceof Player && args.length == 1) {
-				return false;
+      try {
-			}
+        Region selection =
-			cuboid = new Cuboid(minX, minY, minZ, maxX, maxY, maxZ);
+            _plugin
-		}else if(args.length == 5){
+                .worldEdit
-			try{
+                .getSession((Player) sender)
-				minX = Integer.parseInt(args[1]);
+                .getSelection(BukkitAdapter.adapt(_plugin.getWorld()));
-				minY = 0;
+        cuboid = new Cuboid(selection);
-				minZ = Integer.parseInt(args[2]);
+      } catch (IncompleteRegionException ex) {
-				maxX = Integer.parseInt(args[3]);
+        sender.sendMessage("Select a WorldEdit region first.");
-				maxY = _plugin.getWorld().getMaxHeight();
+        return false;
-				maxZ = Integer.parseInt(args[4]);
+      }
-			}catch(NumberFormatException ex){
+    } else if (args.length == 7) {
-				return false;
+      try {
-			}
+        minX = Integer.parseInt(args[1]);
-			cuboid = new Cuboid(minX, minY, minZ, maxX, maxY, maxZ);
+        minY = Integer.parseInt(args[2]);
-		}else{
+        minZ = Integer.parseInt(args[3]);
-			return false;
+        maxX = Integer.parseInt(args[4]);
-		}
+        maxY = Integer.parseInt(args[5]);
-		
+        maxZ = Integer.parseInt(args[6]);
-		String regionName = args[0];
+      } catch (NumberFormatException ex) {
-		
+        return false;
-		_plugin.reserveCuboid(regionName, cuboid);
+      }
-		sender.sendMessage("Reserved plot region " + regionName + ".");
+      cuboid = new Cuboid(minX, minY, minZ, maxX, maxY, maxZ);
-		
+    } else if (args.length == 5) {
-		return true;
+      try {
-	}
+        minX = Integer.parseInt(args[1]);
-
+        minY = 0;
-}
+        minZ = Integer.parseInt(args[2]);
+        maxX = Integer.parseInt(args[3]);
+        maxY = _plugin.getWorld().getMaxHeight();
+        maxZ = Integer.parseInt(args[4]);
+      } catch (NumberFormatException ex) {
+        return false;
+      }
+      cuboid = new Cuboid(minX, minY, minZ, maxX, maxY, maxZ);
+    } else {
+      return false;
+    }
+
+    String regionName = args[0];
+
+    _plugin.reserveCuboid(regionName, cuboid);
+    sender.sendMessage("Reserved plot region " + regionName + ".");
+
+    return true;
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/DebugListener.java

@@ -1,21 +1,38 @@
-package com.majinnaibu.bukkitplugins.metropolis.eventlisteners;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.event.EventHandler;
+
-import org.bukkit.event.EventPriority;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.event.Listener;
+it under the terms of the GNU Affero General Public License as published by
-import org.bukkit.event.player.PlayerInteractEvent;
+the Free Software Foundation, either version 3 of the License, or
-
+(at your option) any later version.
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+
-
+Metropolis is distributed in the hope that it will be useful,
-public class DebugListener implements Listener {
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MetropolisPlugin _plugin;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	
+GNU Affero General Public License for more details.
-	public DebugListener(MetropolisPlugin plugin){
+
-		_plugin = plugin;
+You should have received a copy of the GNU Affero General Public License
-	}
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	
+*/
-	@EventHandler(priority=EventPriority.MONITOR)
+
-	public void onEvent(PlayerInteractEvent event){
+package com.majinnaibu.bukkitplugins.metropolis.eventlisteners;
-		//event.
+
-	}
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-}
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+public class DebugListener implements Listener {
+  MetropolisPlugin _plugin;
+
+  public DebugListener(MetropolisPlugin plugin) {
+    _plugin = plugin;
+  }
+
+  @EventHandler(priority = EventPriority.MONITOR)
+  public void onEvent(PlayerInteractEvent event) {
+    // event.
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/PlayerJoinListener.java

@@ -1,39 +1,73 @@
-package com.majinnaibu.bukkitplugins.metropolis.eventlisteners;
+/*
-
+This file is part of Metropolis.
-import org.bukkit.entity.Player;
+
-import org.bukkit.event.EventHandler;
+Metropolis is free software: you can redistribute it and/or modify
-import org.bukkit.event.EventPriority;
+it under the terms of the GNU Affero General Public License as published by
-import org.bukkit.event.Listener;
+the Free Software Foundation, either version 3 of the License, or
-import org.bukkit.event.player.PlayerJoinEvent;
+(at your option) any later version.
-
+
-import com.majinnaibu.bukkitplugins.metropolis.Cuboid;
+Metropolis is distributed in the hope that it will be useful,
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+but WITHOUT ANY WARRANTY; without even the implied warranty of
-import com.majinnaibu.bukkitplugins.metropolis.PlayerHome;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-
+GNU Affero General Public License for more details.
-public class PlayerJoinListener implements Listener {
+
-	private MetropolisPlugin _plugin = null;
+You should have received a copy of the GNU Affero General Public License
-	
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
-	public PlayerJoinListener(MetropolisPlugin plugin){
+*/
-		_plugin = plugin;
+
-	}
+package com.majinnaibu.bukkitplugins.metropolis.eventlisteners;
-	
+
-	@EventHandler(priority=EventPriority.MONITOR)
+import com.majinnaibu.bukkitplugins.metropolis.Cuboid;
-	public void onPlayerJoin(PlayerJoinEvent event){
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-		Player player = event.getPlayer();
+import com.majinnaibu.bukkitplugins.metropolis.PlayerHome;
-		if(player == null){
+
-			return;
+import org.bukkit.entity.Player;
-		}
+import org.bukkit.event.EventHandler;
-		
+import org.bukkit.event.EventPriority;
-		PlayerHome home = _plugin.getPlayerHome(player);
+import org.bukkit.event.Listener;
-		if(home==null){_plugin.getLogger().info("home is null");}
+import org.bukkit.event.player.PlayerJoinEvent;
-		else if(home.getCuboid() == null){_plugin.getLogger().info("home.getCuboid() is null");}
+
-		else if(home.getCuboid().getVolume() == 0){_plugin.getLogger().info("home.getCuboid().getVolume() is 0");}
+public class PlayerJoinListener implements Listener {
-		
+  private MetropolisPlugin _plugin = null;
-		if(home == null || home.getCuboid() == null || home.getCuboid().getVolume() == 0){
+
-			_plugin.getLogger().info(String.format("Metropolis: Unable to get or create home for player %s", player.getName()));
+  public PlayerJoinListener(MetropolisPlugin plugin) {
-		}else{
+    _plugin = plugin;
-			Cuboid cuboid = home.getCuboid();
+  }
-			player.sendMessage(String.format("Metropolis: Welcome %s your home is between (%d, %d, %d) and (%d, %d, %d)", player.getName(), cuboid.getMinX(), cuboid.getMinY(), cuboid.getMinZ(), cuboid.getMaxX(), cuboid.getMaxY(), cuboid.getMaxZ()));
+
-		}
+  @EventHandler(priority = EventPriority.MONITOR)
-	}
+  public void onPlayerJoin(PlayerJoinEvent event) {
-}
+    Player player = event.getPlayer();
+    if (player == null) {
+      return;
+    }
+
+    PlayerHome home = _plugin.getPlayerHome(player);
+    if (home == null) {
+      _plugin.getLogger().info("home is null");
+    } else if (home.getCuboid() == null) {
+      _plugin.getLogger().info("home.getCuboid() is null");
+    } else if (home.getCuboid().getVolume() == 0) {
+      _plugin.getLogger().info("home.getCuboid().getVolume() is 0");
+    }
+
+    if (home == null || home.getCuboid() == null || home.getCuboid().getVolume() == 0) {
+      _plugin
+          .getLogger()
+          .info(
+              String.format(
+                  "Metropolis: Unable to get or create home for player %s", player.getName()));
+    } else {
+      Cuboid cuboid = home.getCuboid();
+      player.sendMessage(
+          String.format(
+              "Metropolis: Welcome %s your home is between (%d, %d, %d) and (%d, %d, %d)",
+              player.getName(),
+              cuboid.getMinX(),
+              cuboid.getMinY(),
+              cuboid.getMinZ(),
+              cuboid.getMaxX(),
+              cuboid.getMaxY(),
+              cuboid.getMaxZ()));
+    }
+  }
+}

src/main/java/com/majinnaibu/bukkitplugins/metropolis/util/Material.java

@@ -1,5 +1,22 @@
-package com.majinnaibu.bukkitplugins.metropolis.util;
+/*
-
+This file is part of Metropolis.
-public class Material {
+
-	public static final int signTypeId = 63;
+Metropolis is free software: you can redistribute it and/or modify
-}
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
+package com.majinnaibu.bukkitplugins.metropolis.util;
+
+public class Material {
+  public static final int signTypeId = 63;
+}

src/main/resources/Examples/Multiple Plot Sizes.txt

@@ -1,19 +0,0 @@
-Goal: Have 1 plot size for mods and 1 plot size for normals.
-Implementation:
-	1.	Set the plotSize in the config to the larger plot size there are other possible sizes but powers of 2 work really well so lets give mods a 64x64 plot.  Roads are recomended but will eat into the plot on all sides so the roadsize can be ignored for this example.
-	2.	Start the server and run /metropolis-home-generate <username> for each mod.
-	3.	If you have not completed a full ring then run /metropolis-home-generate <test n> where n starts at 1 and increases until you have filled a full ring.  This will reserve those plots for later or anyone who happens to have that username, but that can be dealth with later.
-	4.  Stop the server and change the plotSize to a smaller number like 32.
-	5.	Restart the server and let your users log in.
-	
-Notes:
-	All users will be assigned a small plot when they first connect.  When you make them a mod just delete their current region and change the name of one of the reserved home regions to h_<their username>.
-	/region remove h_jonnynewadmin
-	/region select test_1
-	/region remove test_1
-	/region define h_johnnynewadmin
-	JohnnyNewAdmin's old home will become available for resettlement.  If you want to copy johnny's old blocks into his new home region I'd suggest WorldEdit.
-	This process including optionally copying the blocks will be an upcoming feature.  Probably in 0.5.x and maybe in 0.6.
-	
-	If you later run out of larger plots you can just set the size back to the larger number and let more generate.  Moving and evictions will be coming soon and make this easier.
-	You can manually just create a region for a user before they login named like h_<username> if you want a specific user to have a really big space as well.

src/test/java/com/majinnaibu/bukkitplugins/metropolis/CuboidTest.java

@@ -1,53 +1,70 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
 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 com.sk89q.worldedit.math.BlockVector3;
+
 import org.bukkit.Location;
 import org.junit.jupiter.api.Test;
 
-import com.sk89q.worldedit.math.BlockVector3;
-
 class CuboidTest {
-	@Test
+  @Test
-	void convertsWorldEditBoundsToCuboidCoordinates() {
+  void convertsWorldEditBoundsToCuboidCoordinates() {
-		Cuboid cuboid = new Cuboid(BlockVector3.at(1, 2, 3), BlockVector3.at(4, 5, 6));
+    Cuboid cuboid = new Cuboid(BlockVector3.at(1, 2, 3), BlockVector3.at(4, 5, 6));
 
-		assertEquals(1, cuboid.getMinX());
+    assertEquals(1, cuboid.getMinX());
-		assertEquals(2, cuboid.getMinY());
+    assertEquals(2, cuboid.getMinY());
-		assertEquals(3, cuboid.getMinZ());
+    assertEquals(3, cuboid.getMinZ());
-		assertEquals(4, cuboid.getMaxX());
+    assertEquals(4, cuboid.getMaxX());
-		assertEquals(5, cuboid.getMaxY());
+    assertEquals(5, cuboid.getMaxY());
-		assertEquals(6, cuboid.getMaxZ());
+    assertEquals(6, cuboid.getMaxZ());
-	}
+  }
 
-	@Test
+  @Test
-	void comparesVectorsByXThenZThenYAndHandlesNulls() {
+  void comparesVectorsByXThenZThenYAndHandlesNulls() {
-		assertEquals(-1, Cuboid.compareBlockVectors(null, BlockVector3.ZERO));
+    assertEquals(-1, Cuboid.compareBlockVectors(null, BlockVector3.ZERO));
-		assertEquals(1, Cuboid.compareBlockVectors(BlockVector3.ZERO, null));
+    assertEquals(1, Cuboid.compareBlockVectors(BlockVector3.ZERO, null));
-		assertEquals(0, Cuboid.compareBlockVectors(null, null));
+    assertEquals(0, Cuboid.compareBlockVectors(null, null));
-		assertTrue(Cuboid.compareBlockVectors(BlockVector3.at(1, 0, 0), BlockVector3.at(2, 0, 0)) < 0);
+    assertTrue(Cuboid.compareBlockVectors(BlockVector3.at(1, 0, 0), BlockVector3.at(2, 0, 0)) < 0);
-		assertTrue(Cuboid.compareBlockVectors(BlockVector3.at(1, 0, 1), BlockVector3.at(1, 0, 2)) < 0);
+    assertTrue(Cuboid.compareBlockVectors(BlockVector3.at(1, 0, 1), BlockVector3.at(1, 0, 2)) < 0);
-		assertTrue(Cuboid.compareBlockVectors(BlockVector3.at(1, 1, 2), BlockVector3.at(1, 2, 2)) < 0);
+    assertTrue(Cuboid.compareBlockVectors(BlockVector3.at(1, 1, 2), BlockVector3.at(1, 2, 2)) < 0);
-	}
+  }
 
-	@Test
+  @Test
-	void treatsTouchingBoundsAsIntersecting() {
+  void treatsTouchingBoundsAsIntersecting() {
-		Cuboid first = new Cuboid(0, 0, 0, 10, 10, 10);
+    Cuboid first = new Cuboid(0, 0, 0, 10, 10, 10);
-		Cuboid touching = new Cuboid(10, 10, 10, 20, 20, 20);
+    Cuboid touching = new Cuboid(10, 10, 10, 20, 20, 20);
-		Cuboid separate = new Cuboid(11, 0, 0, 20, 10, 10);
+    Cuboid separate = new Cuboid(11, 0, 0, 20, 10, 10);
 
-		assertTrue(first.intersects(touching));
+    assertTrue(first.intersects(touching));
-		assertFalse(first.intersects(separate));
+    assertFalse(first.intersects(separate));
-	}
+  }
 
-	@Test
+  @Test
-	void containsPointsOnBoundsButRejectsPointsOutside() {
+  void containsPointsOnBoundsButRejectsPointsOutside() {
-		Cuboid cuboid = new Cuboid(1, 2, 3, 4, 5, 6);
+    Cuboid cuboid = new Cuboid(1, 2, 3, 4, 5, 6);
 
-		assertTrue(cuboid.contains(new Location(null, 1, 2, 3)));
+    assertTrue(cuboid.contains(new Location(null, 1, 2, 3)));
-		assertTrue(cuboid.contains(new Location(null, 4, 5, 6)));
+    assertTrue(cuboid.contains(new Location(null, 4, 5, 6)));
-		assertFalse(cuboid.contains(new Location(null, 5, 5, 6)));
+    assertFalse(cuboid.contains(new Location(null, 5, 5, 6)));
-	}
+  }
-}
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/CurrentHomesStoreTest.java

@@ -1,3 +1,20 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,31 +28,34 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 class CurrentHomesStoreTest {
-	@TempDir
+  @TempDir File temporaryDirectory;
-	File temporaryDirectory;
 
-	@Test
+  @Test
-	void roundTripsHomesByUuid() throws Exception {
+  void roundTripsHomesByUuid() throws Exception {
-		File file = new File(temporaryDirectory, "currentHomes.yml");
+    File file = new File(temporaryDirectory, "currentHomes.yml");
-		UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+    UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
-		Map<UUID, Integer> expected = Map.of(playerId, 3);
+    Map<UUID, Integer> expected = Map.of(playerId, 3);
 
-		CurrentHomesStore.save(file, expected);
+    CurrentHomesStore.save(file, expected);
 
-		assertEquals(expected, CurrentHomesStore.load(file, ignored -> null));
+    assertEquals(expected, CurrentHomesStore.load(file, ignored -> null));
-	}
+  }
 
-	@Test
+  @Test
-	void resolvesLegacyPlayerNameKeys() throws Exception {
+  void resolvesLegacyPlayerNameKeys() throws Exception {
-		File file = new File(temporaryDirectory, "currentHomes.yml");
+    File file = new File(temporaryDirectory, "currentHomes.yml");
-		UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+    UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
-		YamlConfiguration yaml = new YamlConfiguration();
+    YamlConfiguration yaml = new YamlConfiguration();
-		yaml.set("OldPlayerName", 2);
+    yaml.set("OldPlayerName", 2);
-		yaml.save(file);
+    yaml.save(file);
 
-		assertEquals(Map.of(playerId, 2), CurrentHomesStore.load(file, name -> {
+    assertEquals(
-			assertEquals("OldPlayerName", name);
+        Map.of(playerId, 2),
-			return playerId;
+        CurrentHomesStore.load(
-		}));
+            file,
-	}
+            name -> {
-}
+              assertEquals("OldPlayerName", name);
+              return playerId;
+            }));
+  }
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/HomeNumberAllocatorTest.java

@@ -0,0 +1,41 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
+package com.majinnaibu.bukkitplugins.metropolis;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+import java.util.UUID;
+
+import com.sk89q.worldedit.math.BlockVector3;
+
+import org.junit.jupiter.api.Test;
+
+class HomeNumberAllocatorTest {
+  @Test
+  void choosesTheFirstUnusedPositiveHomeNumber() {
+    UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+    PlayerHome first =
+        new PlayerHome(playerId, "PlayerName", 1, BlockVector3.ZERO, BlockVector3.ZERO);
+    PlayerHome third =
+        new PlayerHome(playerId, "PlayerName", 3, BlockVector3.ZERO, BlockVector3.ZERO);
+
+    assertEquals(1, HomeNumberAllocator.nextHomeNumber(List.of()));
+    assertEquals(2, HomeNumberAllocator.nextHomeNumber(List.of(first, third)));
+  }
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/HomePermissionOverrideTest.java

@@ -0,0 +1,130 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
+package com.majinnaibu.bukkitplugins.metropolis;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.junit.jupiter.api.Test;
+
+class HomePermissionOverrideTest {
+  @Test
+  void selectsTheHighestPriorityAndUsesLastEntryForTies() throws InvalidConfigurationException {
+    YamlConfiguration config = new YamlConfiguration();
+    config.loadFromString(
+        """
+        permissionOverrides:
+          metropolis.plots.vip:
+            priority: 10
+            plotMultiplier: 2
+            maxPlots: 2
+          metropolis.plots.elite:
+            priority: 20
+            plotMultiplier: 3
+            maxPlots: 5
+          metropolis.plots.staff:
+            priority: 20
+            plotMultiplier: 4
+            maxPlots: 8
+        """);
+    List<String> warnings = new ArrayList<>();
+
+    List<HomePermissionOverride> overrides =
+        HomePermissionOverride.load(
+            config.getConfigurationSection("permissionOverrides"), warnings::add);
+    HomePermissionOverride match =
+        HomePermissionOverride.findMatch(
+            overrides,
+            Set.of("metropolis.plots.vip", "metropolis.plots.elite", "metropolis.plots.staff")
+                ::contains);
+
+    assertEquals(3, overrides.size());
+    assertEquals("metropolis.plots.staff", match.getPermission());
+    assertEquals(4, match.getPlotMultiplier());
+    assertEquals(8, match.getMaxPlots());
+    assertEquals(List.of(), warnings);
+  }
+
+  @Test
+  void preservesDottedPermissionNamesAndSkipsInvalidEntries() throws InvalidConfigurationException {
+    YamlConfiguration config = new YamlConfiguration();
+    config.loadFromString(
+        """
+        permissionOverrides:
+          metropolis.plots.vip:
+            priority: 3
+            plotMultiplier: 2
+            maxPlots: 4
+          metropolis.plots.invalid:
+            plotMultiplier: 2
+            maxPlots: 4
+        """);
+    List<String> warnings = new ArrayList<>();
+
+    List<HomePermissionOverride> overrides =
+        HomePermissionOverride.load(
+            config.getConfigurationSection("permissionOverrides"), warnings::add);
+    HomePermissionOverride match =
+        HomePermissionOverride.findMatch(overrides, "metropolis.plots.vip"::equals);
+
+    assertEquals(1, overrides.size());
+    assertEquals("metropolis.plots.vip", overrides.get(0).getPermission());
+    assertSame(overrides.get(0), match);
+    assertNull(HomePermissionOverride.findMatch(overrides, ignored -> false));
+    assertEquals(1, warnings.size());
+  }
+
+  @Test
+  void resolvesUserOverrideBeforePermissionAndGlobalFallback()
+      throws InvalidConfigurationException {
+    YamlConfiguration config = new YamlConfiguration();
+    config.set("permissionOverrides.metropolis.plots.vip.priority", 10);
+    config.set("permissionOverrides.metropolis.plots.vip.plotMultiplier", 2);
+    config.set("permissionOverrides.metropolis.plots.vip.maxPlots", 4);
+    List<HomePermissionOverride> overrides =
+        HomePermissionOverride.load(
+            config.getConfigurationSection("permissionOverrides"), ignored -> {});
+    UserOverride userOverride = new UserOverride("PlayerName", 3, 6);
+
+    assertEquals(
+        6,
+        HomePermissionOverride.resolveMaxPlots(
+            userOverride, overrides, "metropolis.plots.vip"::equals, 1));
+    assertEquals(
+        3,
+        HomePermissionOverride.resolvePlotMultiplier(
+            userOverride, overrides, "metropolis.plots.vip"::equals, 1));
+    assertEquals(
+        4,
+        HomePermissionOverride.resolveMaxPlots(null, overrides, "metropolis.plots.vip"::equals, 1));
+    assertEquals(
+        2,
+        HomePermissionOverride.resolvePlotMultiplier(
+            null, overrides, "metropolis.plots.vip"::equals, 1));
+    assertEquals(1, HomePermissionOverride.resolveMaxPlots(null, overrides, ignored -> false, 1));
+    assertEquals(
+        1, HomePermissionOverride.resolvePlotMultiplier(null, overrides, ignored -> false, 1));
+  }
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/PlayerHomeTest.java

@@ -1,27 +1,41 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.UUID;
 
-import org.junit.jupiter.api.Test;
-
 import com.sk89q.worldedit.math.BlockVector3;
 
-class PlayerHomeTest {
+import org.junit.jupiter.api.Test;
-	@Test
-	void buildsUuidBasedRegionIdentityAndPreservesDisplayName() {
-		UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
-		PlayerHome home = new PlayerHome(
-				playerId,
-				"PlayerName",
-				2,
-				BlockVector3.at(1, 2, 3),
-				BlockVector3.at(4, 5, 6));
 
-		assertEquals(playerId, home.getPlayerId());
+class PlayerHomeTest {
-		assertEquals("PlayerName", home.getPlayerName());
+  @Test
-		assertEquals(2, home.getNumber());
+  void buildsUuidBasedRegionIdentityAndPreservesDisplayName() {
-		assertEquals("h_2_" + playerId, home.getRegionName());
+    UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
-	}
+    PlayerHome home =
-}
+        new PlayerHome(
+            playerId, "PlayerName", 2, BlockVector3.at(1, 2, 3), BlockVector3.at(4, 5, 6));
+
+    assertEquals(playerId, home.getPlayerId());
+    assertEquals("PlayerName", home.getPlayerName());
+    assertEquals(2, home.getNumber());
+    assertEquals("h_2_" + playerId, home.getRegionName());
+  }
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/PlayerLookupTest.java

@@ -1,3 +1,20 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis;
 
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -11,12 +28,12 @@ import org.bukkit.entity.Player;
 import org.junit.jupiter.api.Test;
 
 class PlayerLookupTest {
-	@Test
+  @Test
-	void matchesOnlinePlayerNamesCaseInsensitivelyButNotByPrefix() {
+  void matchesOnlinePlayerNamesCaseInsensitivelyButNotByPrefix() {
-		Player player = mock(Player.class);
+    Player player = mock(Player.class);
-		when(player.getName()).thenReturn("PlayerName");
+    when(player.getName()).thenReturn("PlayerName");
 
-		assertSame(player, PlayerLookup.findOnline("playername", List.of(player)));
+    assertSame(player, PlayerLookup.findOnline("playername", List.of(player)));
-		assertNull(PlayerLookup.findOnline("Player", List.of(player)));
+    assertNull(PlayerLookup.findOnline("Player", List.of(player)));
-	}
+  }
-}
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeAcquireTest.java

@@ -1,7 +1,24 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.commands;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -9,40 +26,42 @@ import static org.mockito.Mockito.when;
 
 import java.util.UUID;
 
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+import com.majinnaibu.bukkitplugins.metropolis.PlayerHome;
+
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.junit.jupiter.api.Test;
 
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-
 class MetropolisHomeAcquireTest {
-	@Test
+  @Test
-	void assignsAPlotWhenThePlayerIsBelowTheirLimit() {
+  void assignsAPlotWhenThePlayerIsBelowTheirLimit() {
-		MetropolisPlugin plugin = mock(MetropolisPlugin.class);
+    MetropolisPlugin plugin = mock(MetropolisPlugin.class);
-		Player player = mock(Player.class);
+    Player player = mock(Player.class);
-		UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+    UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
-		when(player.getUniqueId()).thenReturn(playerId);
+    when(player.getUniqueId()).thenReturn(playerId);
-		when(plugin.getNumPlots(playerId)).thenReturn(0);
+    when(plugin.getNumPlots(playerId)).thenReturn(0);
-		when(plugin.getMaxPlots(playerId)).thenReturn(1);
+    when(plugin.getMaxPlots(player)).thenReturn(1);
-		MetropolisHomeAcquire executor = new MetropolisHomeAcquire(plugin);
+    when(plugin.acquireHome(player)).thenReturn(mock(PlayerHome.class));
+    MetropolisHomeAcquire executor = new MetropolisHomeAcquire(plugin);
 
-		assertTrue(executor.onCommand(player, mock(Command.class), "acquire", new String[0]));
+    assertTrue(executor.onCommand(player, mock(Command.class), "acquire", new String[0]));
 
-		verify(plugin).assignPlot(player);
+    verify(plugin).acquireHome(player);
-	}
+  }
 
-	@Test
+  @Test
-	void doesNotAssignAPlotAfterThePlayerReachesTheirLimit() {
+  void doesNotAssignAPlotAfterThePlayerReachesTheirLimit() {
-		MetropolisPlugin plugin = mock(MetropolisPlugin.class);
+    MetropolisPlugin plugin = mock(MetropolisPlugin.class);
-		Player player = mock(Player.class);
+    Player player = mock(Player.class);
-		UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+    UUID playerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
-		when(player.getUniqueId()).thenReturn(playerId);
+    when(player.getUniqueId()).thenReturn(playerId);
-		when(plugin.getNumPlots(playerId)).thenReturn(1);
+    when(plugin.getNumPlots(playerId)).thenReturn(1);
-		when(plugin.getMaxPlots(playerId)).thenReturn(1);
+    when(plugin.getMaxPlots(player)).thenReturn(1);
-		MetropolisHomeAcquire executor = new MetropolisHomeAcquire(plugin);
+    MetropolisHomeAcquire executor = new MetropolisHomeAcquire(plugin);
 
-		assertFalse(executor.onCommand(player, mock(Command.class), "acquire", new String[0]));
+    assertFalse(executor.onCommand(player, mock(Command.class), "acquire", new String[0]));
 
-		verify(plugin, never()).assignPlot(player);
+    verify(plugin, never()).acquireHome(player);
-	}
+  }
-}
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotReserveCommandTest.java

@@ -1,3 +1,20 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.commands;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -8,42 +25,46 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 
+import com.majinnaibu.bukkitplugins.metropolis.Cuboid;
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
-import com.majinnaibu.bukkitplugins.metropolis.Cuboid;
-import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
-
 class MetropolisPlotReserveCommandTest {
-	@Test
+  @Test
-	void reservesCoordinatesFromAllSixArguments() {
+  void reservesCoordinatesFromAllSixArguments() {
-		MetropolisPlugin plugin = mock(MetropolisPlugin.class);
+    MetropolisPlugin plugin = mock(MetropolisPlugin.class);
-		CommandSender sender = mock(CommandSender.class);
+    CommandSender sender = mock(CommandSender.class);
-		Command command = mock(Command.class);
+    Command command = mock(Command.class);
-		MetropolisPlotReserveCommand executor = new MetropolisPlotReserveCommand(plugin);
+    MetropolisPlotReserveCommand executor = new MetropolisPlotReserveCommand(plugin);
 
-		assertTrue(executor.onCommand(sender, command, "reserve", new String[] {"north", "1", "2", "3", "4", "5", "6"}));
+    assertTrue(
+        executor.onCommand(
+            sender, command, "reserve", new String[] {"north", "1", "2", "3", "4", "5", "6"}));
 
-		ArgumentCaptor<Cuboid> cuboid = ArgumentCaptor.forClass(Cuboid.class);
+    ArgumentCaptor<Cuboid> cuboid = ArgumentCaptor.forClass(Cuboid.class);
-		verify(plugin).reserveCuboid(eq("north"), cuboid.capture());
+    verify(plugin).reserveCuboid(eq("north"), cuboid.capture());
-		assertEquals(1, cuboid.getValue().getMinX());
+    assertEquals(1, cuboid.getValue().getMinX());
-		assertEquals(2, cuboid.getValue().getMinY());
+    assertEquals(2, cuboid.getValue().getMinY());
-		assertEquals(3, cuboid.getValue().getMinZ());
+    assertEquals(3, cuboid.getValue().getMinZ());
-		assertEquals(4, cuboid.getValue().getMaxX());
+    assertEquals(4, cuboid.getValue().getMaxX());
-		assertEquals(5, cuboid.getValue().getMaxY());
+    assertEquals(5, cuboid.getValue().getMaxY());
-		assertEquals(6, cuboid.getValue().getMaxZ());
+    assertEquals(6, cuboid.getValue().getMaxZ());
-	}
+  }
 
-	@Test
+  @Test
-	void rejectsMalformedCoordinateArgumentsWithoutCallingPlugin() {
+  void rejectsMalformedCoordinateArgumentsWithoutCallingPlugin() {
-		MetropolisPlugin plugin = mock(MetropolisPlugin.class);
+    MetropolisPlugin plugin = mock(MetropolisPlugin.class);
-		CommandSender sender = mock(CommandSender.class);
+    CommandSender sender = mock(CommandSender.class);
-		Command command = mock(Command.class);
+    Command command = mock(Command.class);
-		MetropolisPlotReserveCommand executor = new MetropolisPlotReserveCommand(plugin);
+    MetropolisPlotReserveCommand executor = new MetropolisPlotReserveCommand(plugin);
 
-		assertFalse(executor.onCommand(sender, command, "reserve", new String[] {"north", "1", "two", "3", "4", "5", "6"}));
+    assertFalse(
-		verifyNoInteractions(plugin);
+        executor.onCommand(
-	}
+            sender, command, "reserve", new String[] {"north", "1", "two", "3", "4", "5", "6"}));
-}
+    verifyNoInteractions(plugin);
+  }
+}

src/test/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/PlayerJoinListenerTest.java

@@ -1,3 +1,20 @@
+/*
+This file is part of Metropolis.
+
+Metropolis is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Metropolis is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
+*/
+
 package com.majinnaibu.bukkitplugins.metropolis.eventlisteners;
 
 import static org.mockito.ArgumentMatchers.contains;
@@ -7,31 +24,33 @@ import static org.mockito.Mockito.when;
 
 import java.util.UUID;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.junit.jupiter.api.Test;
-
 import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
 import com.majinnaibu.bukkitplugins.metropolis.PlayerHome;
 import com.sk89q.worldedit.math.BlockVector3;
 
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.junit.jupiter.api.Test;
+
 class PlayerJoinListenerTest {
-	@Test
+  @Test
-	void tellsJoiningPlayerTheirHomeBounds() {
+  void tellsJoiningPlayerTheirHomeBounds() {
-		MetropolisPlugin plugin = mock(MetropolisPlugin.class);
+    MetropolisPlugin plugin = mock(MetropolisPlugin.class);
-		Player player = mock(Player.class);
+    Player player = mock(Player.class);
-		PlayerJoinEvent event = mock(PlayerJoinEvent.class);
+    PlayerJoinEvent event = mock(PlayerJoinEvent.class);
-		when(event.getPlayer()).thenReturn(player);
+    when(event.getPlayer()).thenReturn(player);
-		when(player.getName()).thenReturn("PlayerName");
+    when(player.getName()).thenReturn("PlayerName");
-		when(plugin.getPlayerHome(player)).thenReturn(new PlayerHome(
+    when(plugin.getPlayerHome(player))
-				UUID.fromString("123e4567-e89b-12d3-a456-426614174000"),
+        .thenReturn(
-				"PlayerName",
+            new PlayerHome(
-				1,
+                UUID.fromString("123e4567-e89b-12d3-a456-426614174000"),
-				BlockVector3.at(1, 2, 3),
+                "PlayerName",
-				BlockVector3.at(4, 5, 6)));
+                1,
+                BlockVector3.at(1, 2, 3),
+                BlockVector3.at(4, 5, 6)));
 
-		new PlayerJoinListener(plugin).onPlayerJoin(event);
+    new PlayerJoinListener(plugin).onPlayerJoin(event);
 
-		verify(player).sendMessage(contains("home is between (1, 2, 3) and (4, 5, 6)"));
+    verify(player).sendMessage(contains("home is between (1, 2, 3) and (4, 5, 6)"));
-	}
+  }
-}
+}

tools/publish-modrinth.sh

@@ -44,8 +44,24 @@ MODRINTH_VERSION="${MODRINTH_VERSION:-${VERSION:-}}"
 if [[ -z "$MODRINTH_VERSION" ]]; then
   MODRINTH_VERSION=$(cd "$PROJECT_ROOT" && ./gradlew -q properties --property version | sed -n 's/^version: //p' | head -n1)
 fi
-MODRINTH_CHANGELOG="${MODRINTH_CHANGELOG:-Auto release via publish-modrinth.sh}"
+generate_changelog() {
-MODRINTH_GAME_VERSIONS="${MODRINTH_GAME_VERSIONS:-26.2}"
+  local current_tag previous_tag range commits
+  current_tag=$(git -C "$PROJECT_ROOT" describe --tags --exact-match HEAD 2>/dev/null || true)
+  if [[ -n "$current_tag" ]]; then
+    previous_tag=$(git -C "$PROJECT_ROOT" describe --tags --abbrev=0 "${current_tag}^" 2>/dev/null || true)
+    range="${previous_tag:+$previous_tag..}$current_tag"
+  else
+    previous_tag=$(git -C "$PROJECT_ROOT" describe --tags --abbrev=0 2>/dev/null || true)
+    range="${previous_tag:+$previous_tag..}HEAD"
+  fi
+  commits=$(git -C "$PROJECT_ROOT" log --no-merges --format='- %s (%h)' "$range" 2>/dev/null || true)
+  if [[ -z "$commits" ]]; then
+    commits='- No commit messages found for this release.'
+  fi
+  printf '%s\n\n%s\n' "## What's Changed" "$commits"
+}
+MODRINTH_CHANGELOG="${MODRINTH_CHANGELOG:-$(generate_changelog)}"
+MODRINTH_GAME_VERSIONS="${MODRINTH_GAME_VERSIONS:-26.2,26.3}"
 MODRINTH_LOADERS="${MODRINTH_LOADERS:-paper}"
 MODRINTH_VERSION_TYPE="${MODRINTH_VERSION_TYPE:-}"
 MODRINTH_FILE="${MODRINTH_FILE:-}"