Fixed issue with FLK, renamed Registry to Bus, bumped version to 1.0.3

Author: Apollointhehouse

build.gradle.kts

@@ -133,9 +133,9 @@ dependencies {
 	implementation("org.lwjgl:lwjgl-opengl:$lwjglVersion")
 	implementation("org.lwjgl:lwjgl-stb:$lwjglVersion")
 
-	modImplementation("net.fabricmc:fabric-language-kotlin:$flk_version+kotlin.$kotlin_version") {
-		exclude(group = "net.fabricmc", module = "fabric-loader")
-	}
+    modImplementation("net.fabricmc:fabric-language-kotlin:1.11.0+kotlin.2.0.0") {
+        exclude(group = "net.fabricmc", module = "fabric-loader")
+    }
 }
 
 java {

gradle.properties

@@ -16,6 +16,6 @@ flk_version=1.13.3
 kotlin_version=2.1.21
 
 # Mod
-mod_version=1.0.2
+mod_version=1.0.3
 mod_group=me.apollointhehouse
 mod_name=Raywire

src/main/kotlin/me/apollointhehouse/raywire/Raywire.kt

@@ -1,6 +1,6 @@
 package me.apollointhehouse.raywire
 
-import me.apollointhehouse.raywire.api.Registry
+import me.apollointhehouse.raywire.api.Bus
 import net.fabricmc.api.ModInitializer
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -11,5 +11,5 @@ object Raywire : ModInitializer {
 
 	override fun onInitialize() {}
 
-	val globalRegistry = Registry()
+	val globalBus = Bus()
 }

…apollointhehouse/raywire/api/Registry.kt …n/me/apollointhehouse/raywire/api/Bus.ktsrc/main/kotlin/me/apollointhehouse/raywire/api/Registry.kt renamed to src/main/kotlin/me/apollointhehouse/raywire/api/Bus.kt src/main/kotlin/me/apollointhehouse/raywire/api/Registry.kt renamed to src/main/kotlin/me/apollointhehouse/raywire/api/Bus.kt

@@ -2,9 +2,9 @@ package me.apollointhehouse.raywire.api
 
 import me.apollointhehouse.raywire.internal.EventManager
 
-fun Registry(): Registry = EventManager()
+fun Bus(): Bus = EventManager()
 
-interface Registry {
+interface Bus {
 	/**
 	 * Subscribes given object to scan for event handlers to be invoked
 	 * @param obj the object to be subscribed
@@ -19,7 +19,7 @@ interface Registry {
 
 	/**
 	 * Invokes all event handlers for given event
-	 * @param event Event being invoked
+	 * @param event Event being posted
 	 */
-	fun invoke(event: Event)
+	fun post(event: Event)
 }

src/main/kotlin/me/apollointhehouse/raywire/api/Event.kt

@@ -1,7 +1,7 @@
 package me.apollointhehouse.raywire.api
 
-import me.apollointhehouse.raywire.Raywire.globalRegistry
+import me.apollointhehouse.raywire.Raywire.globalBus
 
 interface Event {
-	fun call() = globalRegistry.invoke(this)
+	fun call() = globalBus.post(this)
 }

src/main/kotlin/me/apollointhehouse/raywire/internal/EventManager.kt

@@ -6,7 +6,7 @@ import java.lang.reflect.Method
 
 typealias Callable = Pair<Any, Method>
 
-internal class EventManager : Registry {
+internal class EventManager : Bus {
 	private val methodCache: MutableMap<Class<out Any>, MutableList<Callable>> = mutableMapOf()
 	private val objectEventMap: MutableMap<Any, MutableList<Class<out Any>>>   = mutableMapOf()
 
@@ -53,9 +53,9 @@ internal class EventManager : Registry {
 
 	/**
 	 * Invoke all event handlers for given event
-	 * @param event Event that called invoke with [Event.call]
+	 * @param event Event that called post
 	 */
-	override fun invoke(event: Event) = try {
+	override fun post(event: Event) = try {
 		val callables = methodCache[event::class.java]?.toList() ?: return
 
 		for ((obj, method) in callables) {