Consolidate dialog boilerplate into AtlasBlockDialog

src/main/kotlin/com/coderjoe/atlas/Atlas.kt

@@ -1,5 +1,6 @@
 package com.coderjoe.atlas
 
+import com.coderjoe.atlas.core.AtlasBlockDialog
 import com.coderjoe.atlas.core.AtlasBlockListener
 import com.coderjoe.atlas.core.BlockDescriptor
 import com.coderjoe.atlas.core.BlockSystem
@@ -64,9 +65,7 @@ class Atlas : JavaPlugin() {
 
         server.pluginManager.registerEvents(PlayerJoinListener(), this)
 
-        PowerBlockDialog.init(this)
-        FluidBlockDialog.init(this)
-        TransportBlockDialog.init(this)
+        AtlasBlockDialog.init(this)
 
         initPowerSystem()
         initFluidSystem()
@@ -149,9 +148,7 @@ class Atlas : JavaPlugin() {
             transportBlockPersistence.save(transportBlockRegistry)
         }
 
-        PowerBlockDialog.cleanup()
-        FluidBlockDialog.cleanup()
-        TransportBlockDialog.cleanup()
+        AtlasBlockDialog.cleanup()
 
         if (::powerBlockRegistry.isInitialized) {
             powerBlockRegistry.stopAll()

src/main/kotlin/com/coderjoe/atlas/core/AtlasBlockDialog.kt

@@ -63,6 +63,23 @@ object AtlasBlockDialog {
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
+    fun <T : AtlasBlock> showBlockDialog(
+        player: Player,
+        block: T,
+        registry: BlockRegistry<*>,
+        displayName: (T) -> String,
+        buildBody: (T) -> Component,
+    ) {
+        showDialog(player, block, registry) { p, b, onClose ->
+            val typed = b as T
+            val title = Component.text(displayName(typed))
+            val body = buildBody(typed)
+            val dialog = createNoticeDialog(title, body, onClose)
+            p.showDialog(dialog)
+        }
+    }
+
     fun showDialog(
         player: Player,
         block: AtlasBlock,

src/main/kotlin/com/coderjoe/atlas/fluid/FluidBlockDialog.kt

@@ -12,36 +12,14 @@ import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import net.kyori.adventure.text.format.TextDecoration
 import org.bukkit.entity.Player
-import org.bukkit.plugin.java.JavaPlugin
 
 object FluidBlockDialog {
-    fun init(plugin: JavaPlugin) {
-        AtlasBlockDialog.init(plugin)
-    }
-
     fun showFluidDialog(
         player: Player,
         fluidBlock: FluidBlock,
         registry: BlockRegistry<*>,
     ) {
-        AtlasBlockDialog.showDialog(player, fluidBlock, registry) { p, block, onClose ->
-            sendDialog(p, block as FluidBlock, onClose)
-        }
-    }
-
-    fun cleanup() {
-        AtlasBlockDialog.cleanup()
-    }
-
-    private fun sendDialog(
-        player: Player,
-        fluidBlock: FluidBlock,
-        onClose: (Player) -> Unit,
-    ) {
-        val title = Component.text(getBlockDisplayName(fluidBlock))
-        val bodyText = buildFluidInfo(fluidBlock)
-        val dialog = AtlasBlockDialog.createNoticeDialog(title, bodyText, onClose)
-        player.showDialog(dialog)
+        AtlasBlockDialog.showBlockDialog(player, fluidBlock, registry, ::getBlockDisplayName, ::buildFluidInfo)
     }
 
     private fun getBlockDisplayName(fluidBlock: FluidBlock): String =

src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt

@@ -28,50 +28,22 @@ import net.kyori.adventure.text.event.ClickCallback
 import net.kyori.adventure.text.format.NamedTextColor
 import net.kyori.adventure.text.format.TextDecoration
 import org.bukkit.entity.Player
-import org.bukkit.plugin.java.JavaPlugin
 
 object PowerBlockDialog {
-    fun init(plugin: JavaPlugin) {
-        AtlasBlockDialog.init(plugin)
-    }
-
     fun showPowerDialog(
         player: Player,
         powerBlock: PowerBlock,
         registry: BlockRegistry<*>,
-    ) {
-        AtlasBlockDialog.showDialog(player, powerBlock, registry) { p, block, onClose ->
-            sendDialog(p, block as PowerBlock, onClose)
-        }
-    }
-
-    fun cleanup() {
-        AtlasBlockDialog.cleanup()
-    }
-
-    private fun sendDialog(
-        player: Player,
-        powerBlock: PowerBlock,
-        onClose: (Player) -> Unit,
     ) {
         if (powerBlock is SmallDrill) {
-            sendDrillDialog(player, powerBlock, onClose)
+            AtlasBlockDialog.showDialog(player, powerBlock, registry) { p, block, onClose ->
+                sendDrillDialog(p, block as SmallDrill, onClose)
+            }
         } else {
-            sendDefaultDialog(player, powerBlock, onClose)
+            AtlasBlockDialog.showBlockDialog(player, powerBlock, registry, ::getBlockDisplayName, ::buildPowerInfo)
         }
     }
 
-    private fun sendDefaultDialog(
-        player: Player,
-        powerBlock: PowerBlock,
-        onClose: (Player) -> Unit,
-    ) {
-        val title = Component.text(getBlockDisplayName(powerBlock))
-        val bodyText = buildPowerInfo(powerBlock)
-        val dialog = AtlasBlockDialog.createNoticeDialog(title, bodyText, onClose)
-        player.showDialog(dialog)
-    }
-
     private fun sendDrillDialog(
         player: Player,
         drill: SmallDrill,

src/main/kotlin/com/coderjoe/atlas/transport/TransportBlockDialog.kt

@@ -7,36 +7,14 @@ import com.coderjoe.atlas.transport.block.ConveyorBelt
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import org.bukkit.entity.Player
-import org.bukkit.plugin.java.JavaPlugin
 
 object TransportBlockDialog {
-    fun init(plugin: JavaPlugin) {
-        AtlasBlockDialog.init(plugin)
-    }
-
     fun showTransportDialog(
         player: Player,
         block: TransportBlock,
         registry: BlockRegistry<*>,
     ) {
-        AtlasBlockDialog.showDialog(player, block, registry) { p, b, onClose ->
-            sendDialog(p, b as TransportBlock, onClose)
-        }
-    }
-
-    fun cleanup() {
-        AtlasBlockDialog.cleanup()
-    }
-
-    private fun sendDialog(
-        player: Player,
-        block: TransportBlock,
-        onClose: (Player) -> Unit,
-    ) {
-        val title = Component.text(getBlockDisplayName(block))
-        val bodyText = getBlockDescription(block)
-        val dialog = AtlasBlockDialog.createNoticeDialog(title, bodyText, onClose)
-        player.showDialog(dialog)
+        AtlasBlockDialog.showBlockDialog(player, block, registry, ::getBlockDisplayName, ::getBlockDescription)
     }
 
     private fun getBlockDisplayName(block: TransportBlock): String =

src/test/kotlin/com/coderjoe/atlas/AtlasPluginTest.kt

@@ -1,12 +1,10 @@
 package com.coderjoe.atlas
 
-import com.coderjoe.atlas.fluid.FluidBlockDialog
+import com.coderjoe.atlas.core.AtlasBlockDialog
 import com.coderjoe.atlas.fluid.FluidBlockFactory
 import com.coderjoe.atlas.fluid.FluidBlockRegistry
-import com.coderjoe.atlas.power.PowerBlockDialog
 import com.coderjoe.atlas.power.PowerBlockFactory
 import com.coderjoe.atlas.power.PowerBlockRegistry
-import com.coderjoe.atlas.transport.TransportBlockDialog
 import com.coderjoe.atlas.transport.TransportBlockFactory
 import com.coderjoe.atlas.transport.TransportBlockRegistry
 import org.junit.jupiter.api.AfterEach
@@ -21,9 +19,7 @@ class AtlasPluginTest {
     @BeforeEach
     fun setup() {
         TestHelper.setup()
-        PowerBlockDialog.init(TestHelper.mockPlugin)
-        FluidBlockDialog.init(TestHelper.mockPlugin)
-        TransportBlockDialog.init(TestHelper.mockPlugin)
+        AtlasBlockDialog.init(TestHelper.mockPlugin)
     }
 
     @AfterEach
@@ -73,9 +69,7 @@ class AtlasPluginTest {
     @Test
     fun `dialog cleanup does not throw`() {
         assertDoesNotThrow {
-            PowerBlockDialog.cleanup()
-            FluidBlockDialog.cleanup()
-            TransportBlockDialog.cleanup()
+            AtlasBlockDialog.cleanup()
         }
     }
 

src/test/kotlin/com/coderjoe/atlas/fluid/FluidBlockDialogTest.kt

@@ -2,6 +2,7 @@ package com.coderjoe.atlas.fluid
 
 import com.coderjoe.atlas.TestHelper
 import com.coderjoe.atlas.TestHelper.callFluidUpdate
+import com.coderjoe.atlas.core.AtlasBlockDialog
 import com.coderjoe.atlas.fluid.block.FluidPipe
 import com.coderjoe.atlas.fluid.block.FluidPump
 import net.kyori.adventure.text.Component
@@ -19,7 +20,7 @@ class FluidBlockDialogTest {
     @BeforeEach
     fun setup() {
         TestHelper.setup()
-        FluidBlockDialog.init(TestHelper.mockPlugin)
+        AtlasBlockDialog.init(TestHelper.mockPlugin)
     }
 
     @AfterEach
@@ -152,6 +153,6 @@ class FluidBlockDialogTest {
 
     @Test
     fun `cleanup does not throw`() {
-        assertDoesNotThrow { FluidBlockDialog.cleanup() }
+        assertDoesNotThrow { AtlasBlockDialog.cleanup() }
     }
 }

src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt

@@ -1,6 +1,7 @@
 package com.coderjoe.atlas.power
 
 import com.coderjoe.atlas.TestHelper
+import com.coderjoe.atlas.core.AtlasBlockDialog
 import com.coderjoe.atlas.power.block.PowerCable
 import com.coderjoe.atlas.power.block.SmallBattery
 import com.coderjoe.atlas.power.block.SmallSolarPanel
@@ -19,7 +20,7 @@ class PowerBlockDialogTest {
     @BeforeEach
     fun setup() {
         TestHelper.setup()
-        PowerBlockDialog.init(TestHelper.mockPlugin)
+        AtlasBlockDialog.init(TestHelper.mockPlugin)
     }
 
     @AfterEach
@@ -108,7 +109,7 @@ class PowerBlockDialogTest {
     @Test
     fun `cleanup clears all active dialogs`() {
         // Just verify it doesn't throw
-        assertDoesNotThrow { PowerBlockDialog.cleanup() }
+        assertDoesNotThrow { AtlasBlockDialog.cleanup() }
     }
 
     private fun flattenText(component: Component): String {