feat(expansion): implement direct chunk expansion command for adjacent plots

Author: WieszczY85

docs/commands.md

@@ -10,6 +10,7 @@ Lista odpowiada aktualnej implementacji. `[argument]` jest opcjonalny, a `<argum
 | `/unclaim` | `plotsx.cmd.unclaim` | Otwiera potwierdzenie usunięcia własnej działki, na której stoi gracz. |
 | `/plot` | `plotsx.cmd.plot` | Otwiera panel działki pod graczem, jeśli jest jej właścicielem, członkiem lub ma dostęp administracyjny; poza działką pokazuje listę własnych działek, również dla OP. |
 | `/plot <nazwa>` | `plotsx.cmd.plot` | Otwiera panel dostępnej działki wyszukanej po nazwie; własna ma pierwszeństwo. |
+| `/plot expand` | `plotsx.cmd.plot` + `plotsx.plot.expand` | Stojąc na wolnym chunku przylegającym bokiem do własnej działki chunkowej, otwiera bezpośrednio potwierdzenie jego zakupu. |
 
 Rodzaj nowej działki wybiera administrator przez `plots.claiming.mode: classic | chunks`.
 W trybie `classic` `/claim` używa `plots.radius`; w trybie `chunks` zajmuje cały
@@ -52,6 +53,7 @@ plots:
     expansion:
       price: 500.0
       priceMultiplier: 1.5
+      standingCommand: true
   expansion:
     price: 500.0
     priceMultiplier: 1.5
@@ -65,6 +67,12 @@ otrzymuje jeden wolny chunk przylegający bokiem do chunka, w którym stoi wła
 Oba warianty są obsługiwane przez GUI ekwipunkowe. Natywne dialogi są zarezerwowane
 dla operacji wymagających wpisania tekstu, takich jak zmiana nazwy działki.
 
+Dla działek chunkowych alternatywą dla wyboru kierunku w panelu jest `/plot expand`:
+właściciel staje na docelowym wolnym chunku, a komenda otwiera od razu potwierdzenie
+zakupu. `plots.chunks.expansion.standingCommand: false` wyłącza ten wariant. Jeśli
+docelowy chunk dotyka kilku działek tego samego właściciela, trzeba użyć panelu
+konkretnej działki, aby wybór był jednoznaczny.
+
 Zakup chunkowy używa osobnego cennika `plots.chunks.expansion`. Cena następnego
 chunka to `price × priceMultiplier ^ liczba_dokupionych_chunków`. Obowiązują
 `maxPerPlot`, `maxTotalOwned`, odpowiadające im uprawnienia liczbowe, wspólny limit

src/main/kotlin/pl/syntaxdevteam/plotsx/commands/PlotCMD.kt

@@ -4,6 +4,9 @@ import io.papermc.paper.command.brigadier.BasicCommand
 import io.papermc.paper.command.brigadier.CommandSourceStack
 import org.bukkit.entity.Player
 import pl.syntaxdevteam.plotsx.PlotsX
+import pl.syntaxdevteam.plotsx.geometry.ChunkGeometry
+import pl.syntaxdevteam.plotsx.geometry.ChunkPosition
+import pl.syntaxdevteam.plotsx.gui.ChunkExpandGUI
 import pl.syntaxdevteam.plotsx.gui.MembersGUI
 import pl.syntaxdevteam.plotsx.gui.PlotGUI
 import pl.syntaxdevteam.plotsx.gui.PlotListGUI
@@ -48,6 +51,10 @@ class PlotCMD(private val plugin: PlotsX) : BasicCommand {
         val player = sender as? Player ?: run { members.reply(sender, "admin_usage"); return }
         if (!PermissionChecker.canManagePlot(player)) { members.reply(player, "denied"); return }
         val standing = plugin.databaseHandler.getPlotAtLocation(player.world.name, player.location.blockX, player.location.blockZ)
+        if (args.firstOrNull().equals("expand", true)) {
+            expandStandingChunk(player, args)
+            return
+        }
         if (args.firstOrNull()?.lowercase() in actions) {
             if (standing == null) { members.reply(player, "stand_on_plot"); return }
             if (args.size == 1 && args[0].equals("members", true) && access.canOpen(player, standing)) {
@@ -84,7 +91,9 @@ class PlotCMD(private val plugin: PlotsX) : BasicCommand {
                 it.world == p.world.name && it.contains(p.location.blockX, p.location.blockZ)
             } }
         val candidates = when {
-            words.size <= 1 -> actions + (if (!admin && access.admin(sender)) listOf("admin") else emptyList())
+            words.size <= 1 -> actions + (if (!admin && plugin.config.getBoolean(
+                    "plots.chunks.expansion.standingCommand", true)) listOf("expand") else emptyList()) +
+                (if (!admin && access.admin(sender)) listOf("admin") else emptyList())
             plot == null || !access.canOpen(sender, plot) -> emptyList()
             words.size == 2 && words[0] == "permission" -> if (access.owner(sender, plot)) access.roles else emptyList()
             words.size == 3 && words[0] == "permission" -> access.actions
@@ -99,4 +108,26 @@ class PlotCMD(private val plugin: PlotsX) : BasicCommand {
         }
         return candidates.filter { it.startsWith(words.lastOrNull().orEmpty(), true) }.distinct().sorted()
     }
+
+    private fun expandStandingChunk(player: Player, args: Array<String>) {
+        fun error(key: String) = player.sendMessage(plugin.messageHandler.stringMessageToComponent("error", key))
+        if (args.size != 1) { error("chunk_expand_command_usage"); return }
+        if (!plugin.config.getBoolean("plots.chunks.expansion.standingCommand", true)) {
+            error("chunk_expand_command_disabled"); return
+        }
+        if (!PermissionChecker.canExpandPlot(player)) { error("no_permission"); return }
+        val target = ChunkPosition.atBlock(player.location.blockX, player.location.blockZ)
+        if (plugin.cacheManager.getCachedPlots().any {
+                it.world.equals(player.world.name, true) && it.geometry.contains(player.location.blockX, player.location.blockZ)
+            }) { error("chunk_expand_target_owned"); return }
+        val candidates = plugin.cacheManager.getCachedPlots().filter { plot ->
+            plot.ownerUuid == player.uniqueId && plot.world.equals(player.world.name, true) &&
+                (plot.geometry as? ChunkGeometry)?.expansionTo(target) != null
+        }
+        when (candidates.size) {
+            0 -> error("chunk_expand_no_adjacent")
+            1 -> plugin.guiHandler.registerGui(player, ChunkExpandGUI(plugin, candidates.single().id, target))
+            else -> error("chunk_expand_ambiguous")
+        }
+    }
 }

src/main/kotlin/pl/syntaxdevteam/plotsx/geometry/ChunkGeometry.kt

@@ -33,6 +33,8 @@ data class ChunkPosition(val x: Int, val z: Int) {
 
 /** A nonempty, side-connected set of complete chunks; holes inside its bounds remain unclaimed. */
 class ChunkGeometry(chunks: Collection<ChunkPosition>) : PlotGeometry {
+    data class Expansion(val source: ChunkPosition, val direction: ExpansionDirection, val target: ChunkPosition)
+
     val chunks: Set<ChunkPosition> = Collections.unmodifiableSet(LinkedHashSet(chunks))
 
     init {
@@ -70,4 +72,18 @@ class ChunkGeometry(chunks: Collection<ChunkPosition>) : PlotGeometry {
         if (source !in chunks) return null
         return source.neighbour(direction)?.takeUnless { it in chunks }
     }
+
+    /** Resolves a free chunk selected by standing on it to an expansion from this plot. */
+    fun expansionTo(target: ChunkPosition): Expansion? {
+        if (target in chunks) return null
+        for (direction in ExpansionDirection.entries) {
+            val sourceX = target.x.toLong() - direction.dx
+            val sourceZ = target.z.toLong() - direction.dz
+            if (sourceX !in ChunkPosition.MIN_COORDINATE.toLong()..ChunkPosition.MAX_COORDINATE.toLong() ||
+                sourceZ !in ChunkPosition.MIN_COORDINATE.toLong()..ChunkPosition.MAX_COORDINATE.toLong()) continue
+            val source = ChunkPosition(sourceX.toInt(), sourceZ.toInt())
+            if (source in chunks) return Expansion(source, direction, target)
+        }
+        return null
+    }
 }

src/main/kotlin/pl/syntaxdevteam/plotsx/gui/ChunkExpandGUI.kt

@@ -14,7 +14,11 @@ import java.math.BigDecimal
 import java.util.UUID
 
 /** Chunk offers use cached data. All SQL in the purchase is performed by a worker. */
-internal class ChunkExpandGUI(private val plugin: PlotsX, private val plotId: Int) : AbstractGUI(
+internal class ChunkExpandGUI(
+    private val plugin: PlotsX,
+    private val plotId: Int,
+    private val requestedTarget: ChunkPosition? = null
+) : AbstractGUI(
     plugin.messageHandler.stringMessageToComponentNoPrefix("GUI", "expand.title"), 27
 ) {
     private val directions = mapOf(4 to ExpansionDirection.NORTH, 14 to ExpansionDirection.EAST,
@@ -37,9 +41,16 @@ internal class ChunkExpandGUI(private val plugin: PlotsX, private val plotId: In
         val plot = plugin.cacheManager.getPlot(plotId) ?: return null
         val geometry = plot.geometry as? ChunkGeometry ?: return null
         offered = plot
-        source = if (player.world.name == plot.world) ChunkPosition.atBlock(player.location.blockX, player.location.blockZ)
-            .takeIf { it in geometry.chunks } else null
-        target = source?.let { geometry.expansion(direction, it) }
+        if (requestedTarget != null) {
+            val expansion = geometry.expansionTo(requestedTarget) ?: return null
+            source = expansion.source
+            direction = expansion.direction
+            target = expansion.target
+        } else {
+            source = if (player.world.name == plot.world) ChunkPosition.atBlock(player.location.blockX, player.location.blockZ)
+                .takeIf { it in geometry.chunks } else null
+            target = source?.let { geometry.expansion(direction, it) }
+        }
         price = ExpansionEconomy.chunkPrice(plugin, plot.expansionLevel)
         operationId = UUID.randomUUID()
         return plot
@@ -66,7 +77,7 @@ internal class ChunkExpandGUI(private val plugin: PlotsX, private val plotId: In
         event.isCancelled = true
         val player = event.whoClicked as? Player ?: return
         if (submitted) return
-        directions[event.rawSlot]?.let {
+        directions[event.rawSlot]?.takeIf { requestedTarget == null }?.let {
             direction = it
             player.scheduler.run(plugin, {
                 if (!submitted && player.openInventory.topInventory === inventory) open(player)
@@ -101,8 +112,9 @@ internal class ChunkExpandGUI(private val plugin: PlotsX, private val plotId: In
             if (!player.isOnline || !PermissionChecker.canExpandPlot(player) || owner != plot.ownerUuid) return false
             val current = plugin.cacheManager.getPlot(plotId) ?: return false
             if (current.ownerUuid != owner || current.geometryRevision != plot.geometryRevision || current.radius != null ||
-                current.expansionLevel != plot.expansionLevel || player.world.name != plot.world ||
-                ChunkPosition.atBlock(player.location.blockX, player.location.blockZ) != from) return false
+                current.expansionLevel != plot.expansionLevel || player.world.name != plot.world) return false
+            val standing = ChunkPosition.atBlock(player.location.blockX, player.location.blockZ)
+            if ((requestedTarget == null && standing != from) || (requestedTarget != null && standing != to)) return false
             if (ExpansionEconomy.chunkPrice(plugin, current.expansionLevel)?.compareTo(amount) != 0 || limits(player) != limits) return false
             return plugin.regionProtectionHook?.overlapsBounds(player.world, to.bounds) != true
         }

src/main/resources/config.yml

@@ -46,6 +46,9 @@ plots:
       # Price per additional chunk; the first claimed chunk remains free.
       price: 500.0
       priceMultiplier: 1.5
+      # Allow /plot expand while standing on a free chunk adjacent to your chunk plot.
+      # The command skips direction selection and opens the purchase confirmation directly.
+      standingCommand: true
   # Maximum plots across ALL worlds; override with plotsx.plot.max-plots.<number>.
   # Highest granted numeric permission wins; without one, this value is used.
   maxPlots: 5

src/main/resources/lang/messages_en.yml

@@ -11,6 +11,11 @@ prefix: "<gradient:#11ff00:#d4ffde:#70e672:#d4ffde:#11ff00>[<b>PlotsX</b>]</grad
 error:
   chunk_purchase_busy: "Another plot operation is in progress. Please retry shortly."
   chunk_purchase_review: "Payment requires review. Operation: <operation>"
+  chunk_expand_command_usage: "<yellow>Usage: /plot expand — stand on a free chunk next to your plot.</yellow>"
+  chunk_expand_command_disabled: "<red>Expansion by standing on the target chunk is disabled.</red>"
+  chunk_expand_target_owned: "<red>The chunk you are standing on is already claimed.</red>"
+  chunk_expand_no_adjacent: "<red>This chunk does not share a side with any of your chunk plots.</red>"
+  chunk_expand_ambiguous: "<red>This chunk touches more than one of your plots. Use the selected plot's menu.</red>"
   chunk_expansion_pending: "Chunk expansion is not available in this implementation stage."
   claim_chunk_limit: "The per-plot or owner chunk limit has been reached."
   expand_invalid_price: "<red>Invalid expansion price in configuration.</red>"

src/main/resources/lang/messages_pl.yml

@@ -11,6 +11,11 @@ prefix: "<gradient:#11ff00:#d4ffde:#70e672:#d4ffde:#11ff00>[<b>PlotsX</b>]</grad
 error:
   chunk_purchase_busy: "Trwa inna operacja działki. Spróbuj ponownie za chwilę."
   chunk_purchase_review: "Płatność wymaga wyjaśnienia. Operacja: <operation>"
+  chunk_expand_command_usage: "<yellow>Użycie: /plot expand — stań na wolnym chunku obok swojej działki.</yellow>"
+  chunk_expand_command_disabled: "<red>Rozszerzanie przez stanie na docelowym chunku jest wyłączone.</red>"
+  chunk_expand_target_owned: "<red>Chunk, na którym stoisz, jest już zajęty.</red>"
+  chunk_expand_no_adjacent: "<red>Ten chunk nie przylega bokiem do żadnej Twojej działki chunkowej.</red>"
+  chunk_expand_ambiguous: "<red>Ten chunk przylega do kilku Twoich działek. Użyj panelu wybranej działki.</red>"
   chunk_expansion_pending: "Rozszerzanie działek chunkowych nie jest jeszcze dostępne na tym etapie wdrożenia."
   claim_chunk_limit: "Osiągnięto limit chunków działki lub właściciela."
   expand_invalid_price: "<red>Nieprawidłowa cena rozszerzenia w konfiguracji.</red>"

src/test/kotlin/pl/syntaxdevteam/plotsx/geometry/ChunkGeometryTest.kt

@@ -122,6 +122,17 @@ class ChunkGeometryTest {
         assertNull(plot.expansion(ExpansionDirection.EAST, ChunkPosition(5, 5)))
     }
 
+    @Test fun `standing target resolves its adjacent source and direction`() {
+        val plot = ChunkGeometry(listOf(ChunkPosition(0, 0), ChunkPosition(1, 0)))
+        val expansion = plot.expansionTo(ChunkPosition(2, 0))
+        assertEquals(ChunkPosition(1, 0), expansion?.source)
+        assertEquals(ExpansionDirection.EAST, expansion?.direction)
+        assertEquals(ChunkPosition(2, 0), expansion?.target)
+        assertNull(plot.expansionTo(ChunkPosition(1, 0)))
+        assertNull(plot.expansionTo(ChunkPosition(3, 0)))
+        assertNull(plot.expansionTo(ChunkPosition(2, 1)))
+    }
+
     @Test fun `integer block extremes are represented exactly and outward expansion is rejected`() {
         val low = ChunkPosition.atBlock(Int.MIN_VALUE, Int.MIN_VALUE)
         val high = ChunkPosition.atBlock(Int.MAX_VALUE, Int.MAX_VALUE)