Clean up event emitter listeners

yogwoggf · Apr 27, 2024 · f7b5767 · f7b5767
1 parent 763bac5
commit f7b5767
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/src/main/kotlin/com/puffy/events/BasicEventListener.kt b/src/main/kotlin/com/puffy/events/BasicEventListener.kt
@@ -0,0 +1,24 @@
+package com.puffy.events
+
+class BasicEventListener<Identifier, EventType> : EventStreamListener<Identifier, EventType> {
+    private val listeners: MutableMap<Identifier, MutableSet<EventListener<EventType>>> =
+        mutableMapOf()
+
+    override fun register(identifier: Identifier, listener: EventListener<EventType>) {
+        if (listeners[identifier] == null) {
+            listeners[identifier] = mutableSetOf()
+        }
+
+        listeners[identifier]?.add(listener)
+    }
+
+    override fun unregister(identifier: Identifier, listener: EventListener<EventType>) {
+        listeners[identifier]?.remove(listener)
+    }
+
+    fun notifyListeners(event: EventType) {
+        listeners.forEach { entry ->
+            entry.value.forEach { eventListener -> eventListener.onEvent(event) }
+        }
+    }
+}
diff --git a/src/main/kotlin/com/puffy/events/DetectionEventEmitter.kt b/src/main/kotlin/com/puffy/events/DetectionEventEmitter.kt
@@ -5,34 +5,13 @@ import net.minecraft.server.network.ServerPlayerEntity
 data class DetectionInfo(val detectionSourceName: String, val player: ServerPlayerEntity)
 
 object DetectionEventEmitter : EventStream<DetectionInfo> {
-    private object DetectionEventListener : EventStreamListener<String, DetectionInfo> {
-        private val listeners: MutableMap<String, MutableSet<EventListener<DetectionInfo>>> =
-            mutableMapOf()
-
-        override fun register(identifier: String, listener: EventListener<DetectionInfo>) {
-            if (listeners[identifier] == null) {
-                listeners[identifier] = mutableSetOf()
-            }
-
-            listeners[identifier]?.add(listener)
-        }
-
-        override fun unregister(identifier: String, listener: EventListener<DetectionInfo>) {
-            listeners[identifier]?.remove(listener)
-        }
-
-        fun notifyListeners(event: DetectionInfo) {
-            listeners.forEach { entry ->
-                entry.value.forEach { eventListener -> eventListener.onEvent(event) }
-            }
-        }
-    }
+    private val eventListener = BasicEventListener<String, DetectionInfo>()
 
     override fun sendEvent(event: DetectionInfo) {
-        DetectionEventListener.notifyListeners(event)
+        eventListener.notifyListeners(event)
     }
 
     fun addListener(identifier: String, listener: EventListener<DetectionInfo>) {
-        DetectionEventListener.register(identifier, listener)
+        eventListener.register(identifier, listener)
     }
 }