Reform Heimdall to move event collectors to the event class themselves.

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/FoundationHeimdallPlugin.kt

@@ -4,29 +4,20 @@ import com.charleskorn.kaml.Yaml
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
 import gay.pizza.foundation.common.FoundationCoreLoader
-import gay.pizza.foundation.shared.PluginMainClass
-import gay.pizza.foundation.shared.copyDefaultConfig
 import gay.pizza.foundation.heimdall.plugin.buffer.BufferFlushThread
 import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
-import gay.pizza.foundation.heimdall.plugin.event.*
+import gay.pizza.foundation.heimdall.plugin.event.EventCollector
+import gay.pizza.foundation.heimdall.plugin.event.EventCollectorProviders
 import gay.pizza.foundation.heimdall.plugin.export.ExportAllChunksCommand
 import gay.pizza.foundation.heimdall.plugin.load.ImportWorldLoadCommand
 import gay.pizza.foundation.heimdall.plugin.model.HeimdallConfig
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
+import gay.pizza.foundation.shared.PluginMainClass
-import org.bukkit.event.EventHandler
+import gay.pizza.foundation.shared.copyDefaultConfig
 import org.bukkit.event.Listener
-import org.bukkit.event.block.BlockBreakEvent
-import org.bukkit.event.block.BlockPlaceEvent
-import org.bukkit.event.entity.EntityDeathEvent
-import org.bukkit.event.entity.PlayerDeathEvent
-import org.bukkit.event.player.*
 import org.bukkit.plugin.java.JavaPlugin
 import org.jetbrains.exposed.sql.Database
 import org.postgresql.Driver
 import java.time.Duration
-import java.time.Instant
-import java.util.*
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.io.path.inputStream
 
 @PluginMainClass
@@ -38,15 +29,15 @@ class FoundationHeimdallPlugin : JavaPlugin(), Listener {
   private val buffer = EventBuffer()
   private val bufferFlushThread = BufferFlushThread(this, buffer)
 
-  private val playerJoinTimes = ConcurrentHashMap<UUID, Instant>()
+  private val collectors = mutableListOf<EventCollector<*>>()
-
-  private val legacyComponentSerializer = LegacyComponentSerializer.builder().build()
 
   override fun onEnable() {
-    val exportChunksCommand = getCommand("export_all_chunks") ?: throw Exception("Failed to get export_all_chunks command")
+    val exportChunksCommand = getCommand("export_all_chunks") ?:
+      throw Exception("Failed to get export_all_chunks command")
     exportChunksCommand.setExecutor(ExportAllChunksCommand(this))
 
-    val importWorldLoadCommand = getCommand("import_world_load") ?: throw Exception("Failed to get import_world_load command")
+    val importWorldLoadCommand = getCommand("import_world_load") ?:
+      throw Exception("Failed to get import_world_load command")
     importWorldLoadCommand.setExecutor(ImportWorldLoadCommand(this))
 
     val foundation = FoundationCoreLoader.get(server)
@@ -98,79 +89,20 @@ class FoundationHeimdallPlugin : JavaPlugin(), Listener {
     db = Database.connect(pool)
     server.pluginManager.registerEvents(this, this)
     bufferFlushThread.start()
-  }
 
-  @EventHandler
+    for (collectorProvider in EventCollectorProviders.all) {
-  fun onPlayerMove(event: PlayerMoveEvent) = buffer.push(PlayerPosition(event))
+      val collector = collectorProvider.collector(buffer)
-
+      server.pluginManager.registerEvents(collector, this)
-  @EventHandler
+      collectors.add(collector)
-  fun onBlockBroken(event: BlockPlaceEvent) = buffer.push(BlockPlace(event))
-
-  @EventHandler
-  fun onBlockBroken(event: BlockBreakEvent) = buffer.push(BlockBreak(event))
-
-  @EventHandler
-  fun onPlayerJoin(event: PlayerJoinEvent) {
-    playerJoinTimes[event.player.uniqueId] = Instant.now()
-  }
-
-  @EventHandler
-  fun onPlayerQuit(event: PlayerQuitEvent) {
-    val startTime = playerJoinTimes.remove(event.player.uniqueId) ?: return
-    val endTime = Instant.now()
-    buffer.push(PlayerSession(event.player.uniqueId, event.player.name, startTime, endTime))
-  }
-
-  @EventHandler
-  fun onPlayerDeath(event: PlayerDeathEvent) {
-    val deathMessage = event.deathMessage()
-    val deathMessageString = if (deathMessage != null) {
-      legacyComponentSerializer.serialize(deathMessage)
-    } else {
-      null
     }
-    buffer.push(PlayerDeath(event, deathMessageString))
-  }
-
-  @EventHandler
-  fun onPlayerAdvancementDone(event: PlayerAdvancementDoneEvent) = buffer.push(PlayerAdvancement(event))
-
-  @EventHandler
-  fun onWorldLoad(event: PlayerChangedWorldEvent) = buffer.push(
-    WorldChange(
-      event.player.uniqueId,
-      event.from.uid,
-      event.from.name,
-      event.player.world.uid,
-      event.player.world.name
-    )
-  )
-
-  @EventHandler
-  fun onEntityDeath(event: EntityDeathEvent) {
-    val killer = event.entity.killer ?: return
-    buffer.push(
-      EntityKill(
-        killer.uniqueId,
-        killer.location,
-        event.entity.uniqueId,
-        event.entityType.key.toString()
-      )
-    )
   }
 
   override fun onDisable() {
     bufferFlushThread.stop()
-    val endTime = Instant.now()
+    for (collector in collectors) {
-    for (playerId in playerJoinTimes.keys().toList()) {
+      collector.onPluginDisable(server)
-      val startTime = playerJoinTimes.remove(playerId) ?: continue
-      buffer.push(PlayerSession(
-        playerId,
-        server.getPlayer(playerId)?.name ?: "__unknown__",
-        startTime,
-        endTime
-      ))
     }
+    collectors.clear()
     bufferFlushThread.flush()
   }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/buffer/EventBuffer.kt

@@ -3,7 +3,7 @@ package gay.pizza.foundation.heimdall.plugin.buffer
 import gay.pizza.foundation.heimdall.plugin.event.HeimdallEvent
 import org.jetbrains.exposed.sql.Transaction
 
-class EventBuffer {
+class EventBuffer : IEventBuffer {
   private var events = mutableListOf<HeimdallEvent>()
 
   fun flush(transaction: Transaction): Long {
@@ -18,7 +18,7 @@ class EventBuffer {
     return count
   }
 
-  fun push(event: HeimdallEvent) {
+  override fun push(event: HeimdallEvent) {
     events.add(event)
   }
 

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/buffer/IEventBuffer.kt

@@ -0,0 +1,7 @@
+package gay.pizza.foundation.heimdall.plugin.buffer
+
+import gay.pizza.foundation.heimdall.plugin.event.HeimdallEvent
+
+interface IEventBuffer {
+  fun push(event: HeimdallEvent)
+}

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/BlockBreak.kt

@@ -1,8 +1,11 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.BlockBreakTable
 import org.bukkit.Location
 import org.bukkit.Material
+import org.bukkit.event.EventHandler
 import org.bukkit.event.block.BlockBreakEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
@@ -29,4 +32,13 @@ class BlockBreak(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<BlockBreak> {
+    @EventHandler
+    fun onBlockBroken(event: BlockBreakEvent) = buffer.push(BlockBreak(event))
+  }
+
+  companion object : EventCollectorProvider<BlockBreak> {
+    override fun collector(buffer: EventBuffer): EventCollector<BlockBreak> = Collector(buffer)
+  }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/BlockPlace.kt

@@ -1,8 +1,11 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.BlockPlaceTable
 import org.bukkit.Location
 import org.bukkit.Material
+import org.bukkit.event.EventHandler
 import org.bukkit.event.block.BlockPlaceEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
@@ -29,4 +32,13 @@ class BlockPlace(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<BlockPlace> {
+    @EventHandler
+    fun onBlockPlaced(event: BlockPlaceEvent) = buffer.push(BlockPlace(event))
+  }
+
+  companion object : EventCollectorProvider<BlockPlace> {
+    override fun collector(buffer: EventBuffer): EventCollector<BlockPlace> = Collector(buffer)
+  }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/EntityKill.kt

@@ -1,7 +1,11 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.EntityKillTable
 import org.bukkit.Location
+import org.bukkit.event.EventHandler
+import org.bukkit.event.entity.EntityDeathEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
 import java.time.Instant
@@ -23,4 +27,23 @@ class EntityKill(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<EntityKill> {
+    @EventHandler
+    fun onEntityDeath(event: EntityDeathEvent) {
+      val killer = event.entity.killer ?: return
+      buffer.push(
+        EntityKill(
+          killer.uniqueId,
+          killer.location,
+          event.entity.uniqueId,
+          event.entityType.key.toString()
+        )
+      )
+    }
+  }
+
+  companion object : EventCollectorProvider<EntityKill> {
+    override fun collector(buffer: EventBuffer): EventCollector<EntityKill> = Collector(buffer)
+  }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/EventCollector.kt

@@ -0,0 +1,8 @@
+package gay.pizza.foundation.heimdall.plugin.event
+
+import org.bukkit.Server
+import org.bukkit.event.Listener
+
+interface EventCollector<T : HeimdallEvent> : Listener {
+  fun onPluginDisable(server: Server) {}
+}

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/EventCollectorProvider.kt

@@ -0,0 +1,7 @@
+package gay.pizza.foundation.heimdall.plugin.event
+
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+
+interface EventCollectorProvider<T : HeimdallEvent> {
+  fun collector(buffer: EventBuffer): EventCollector<T>
+}

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/EventCollectorProviders.kt

@@ -0,0 +1,14 @@
+package gay.pizza.foundation.heimdall.plugin.event
+
+object EventCollectorProviders {
+  val all = listOf<EventCollectorProvider<*>>(
+    BlockBreak,
+    BlockPlace,
+    EntityKill,
+    PlayerAdvancement,
+    PlayerDeath,
+    PlayerPosition,
+    PlayerSession,
+    WorldChange
+  )
+}

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/ExposedExtensions.kt

@@ -30,11 +30,7 @@ fun <T : PlayerTimedLocalEventTable, K : Any> T.putPlayerTimedLocalEvent(
   location: Location,
   player: UUID
 ) {
-  statement[this.time] = time
+  putTimedLocalEvent(statement, time, location)
-  statement[this.world] = location.world.uid
-  statement[this.x] = location.x
-  statement[this.y] = location.y
-  statement[this.z] = location.z
   statement[this.player] = player
   statement[this.pitch] = location.pitch.toDouble()
   statement[this.yaw] = location.yaw.toDouble()

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/PlayerAdvancement.kt

@@ -1,8 +1,11 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.PlayerAdvancementTable
 import org.bukkit.Location
 import org.bukkit.advancement.Advancement
+import org.bukkit.event.EventHandler
 import org.bukkit.event.player.PlayerAdvancementDoneEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
@@ -29,4 +32,13 @@ class PlayerAdvancement(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<PlayerAdvancement> {
+    @EventHandler
+    fun onPlayerAdvancementDone(event: PlayerAdvancementDoneEvent) = buffer.push(PlayerAdvancement(event))
+  }
+
+  companion object : EventCollectorProvider<PlayerAdvancement> {
+    override fun collector(buffer: EventBuffer): EventCollector<PlayerAdvancement> = Collector(buffer)
+  }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/PlayerDeath.kt

@@ -1,7 +1,11 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.PlayerDeathTable
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
 import org.bukkit.Location
+import org.bukkit.event.EventHandler
 import org.bukkit.event.entity.PlayerDeathEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
@@ -31,4 +35,23 @@ class PlayerDeath(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<PlayerDeath> {
+    private val legacyComponentSerializer = LegacyComponentSerializer.builder().build()
+
+    @EventHandler
+    fun onPlayerDeath(event: PlayerDeathEvent) {
+      val deathMessage = event.deathMessage()
+      val deathMessageString = if (deathMessage != null) {
+        legacyComponentSerializer.serialize(deathMessage)
+      } else {
+        null
+      }
+      buffer.push(PlayerDeath(event, deathMessageString))
+    }
+  }
+
+  companion object : EventCollectorProvider<PlayerDeath> {
+    override fun collector(buffer: EventBuffer): EventCollector<PlayerDeath> = Collector(buffer)
+  }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/PlayerPosition.kt

@@ -1,7 +1,10 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.PlayerPositionTable
 import org.bukkit.Location
+import org.bukkit.event.EventHandler
 import org.bukkit.event.player.PlayerMoveEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
@@ -25,4 +28,13 @@ class PlayerPosition(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<PlayerPosition> {
+    @EventHandler
+    fun onPlayerMove(event: PlayerMoveEvent) = buffer.push(PlayerPosition(event))
+  }
+
+  companion object : EventCollectorProvider<PlayerPosition> {
+    override fun collector(buffer: EventBuffer): EventCollector<PlayerPosition> = Collector(buffer)
+  }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/PlayerSession.kt

@@ -1,10 +1,17 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.PlayerSessionTable
+import org.bukkit.Server
+import org.bukkit.event.EventHandler
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
 import java.time.Instant
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 
 class PlayerSession(
   val playerUniqueIdentity: UUID,
@@ -23,4 +30,37 @@ class PlayerSession(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<PlayerSession> {
+    private val playerJoinTimes = ConcurrentHashMap<UUID, Instant>()
+
+    @EventHandler
+    fun onPlayerJoin(event: PlayerJoinEvent) {
+      playerJoinTimes[event.player.uniqueId] = Instant.now()
+    }
+
+    @EventHandler
+    fun onPlayerQuit(event: PlayerQuitEvent) {
+      val startTime = playerJoinTimes.remove(event.player.uniqueId) ?: return
+      val endTime = Instant.now()
+      buffer.push(PlayerSession(event.player.uniqueId, event.player.name, startTime, endTime))
+    }
+
+    override fun onPluginDisable(server: Server) {
+      val endTime = Instant.now()
+      for (playerId in playerJoinTimes.keys().toList()) {
+        val startTime = playerJoinTimes.remove(playerId) ?: continue
+        buffer.push(PlayerSession(
+          playerId,
+          server.getPlayer(playerId)?.name ?: "__unknown__",
+          startTime,
+          endTime
+        ))
+      }
+    }
+  }
+
+  companion object : EventCollectorProvider<PlayerSession> {
+    override fun collector(buffer: EventBuffer): EventCollector<PlayerSession> = Collector(buffer)
+  }
 }

foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/WorldChange.kt

@@ -1,6 +1,10 @@
 package gay.pizza.foundation.heimdall.plugin.event
 
+import gay.pizza.foundation.heimdall.plugin.buffer.EventBuffer
+import gay.pizza.foundation.heimdall.plugin.buffer.IEventBuffer
 import gay.pizza.foundation.heimdall.table.WorldChangeTable
+import org.bukkit.event.EventHandler
+import org.bukkit.event.player.PlayerChangedWorldEvent
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.insert
 import java.time.Instant
@@ -26,4 +30,21 @@ class WorldChange(
       }
     }
   }
+
+  class Collector(val buffer: IEventBuffer) : EventCollector<WorldChange> {
+    @EventHandler
+    fun onWorldLoad(event: PlayerChangedWorldEvent) = buffer.push(
+      WorldChange(
+        event.player.uniqueId,
+        event.from.uid,
+        event.from.name,
+        event.player.world.uid,
+        event.player.world.name
+      )
+    )
+  }
+
+  companion object : EventCollectorProvider<WorldChange> {
+    override fun collector(buffer: EventBuffer): EventCollector<WorldChange> = Collector(buffer)
+  }
 }