Fix hotswap agent & child event mapping

Quutio · Jun 17, 2024 · 39dd130 · 39dd130
1 parent b4fdf69
commit 39dd130
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 allprojects {
 	group = "io.quut"
-	version = "1.2"
+	version = "1.2.1"
 
 	apply(plugin = "com.diffplug.spotless")
 

diff --git a/harmony-hostswap-agent/src/main/java/io/quut/harmony/hotswapagent/HarmonyPlugin.java b/harmony-hostswap-agent/src/main/java/io/quut/harmony/hotswapagent/HarmonyPlugin.java
@@ -49,6 +49,7 @@ public static void registerManager(final CtClass ctClass, final ClassPool classP
 			classPool.get("org.spongepowered.plugin.PluginContainer"),
 			classPool.get("java.util.Map"),
 			classPool.get("java.util.Map"),
+			classPool.get("java.util.Map")
 		}).insertAfter(initialization.toString());
 	}
 

diff --git a/harmony-sponge/src/main/kotlin/io/quut/harmony/sponge/SpongeHarmonyEventManager.kt b/harmony-sponge/src/main/kotlin/io/quut/harmony/sponge/SpongeHarmonyEventManager.kt
@@ -121,7 +121,7 @@ internal class SpongeHarmonyEventManager<T : Any>(
 				val scope: T = mapping(e) ?: return@EventListener
 				val scopeData: ScopeData = this.scopes[scope] ?: return@EventListener
 
-				scopeData.handleEvent(scope, e, listener.eventType.type)
+				scopeData.handleEvent(scope, e)
 			}
 
 			Sponge.game().eventManager().registerListener(
@@ -210,11 +210,23 @@ internal class SpongeHarmonyEventManager<T : Any>(
 		private val child: SpongeHarmonyEventManager<*>?,
 		private val childMappings: Map<Class<*>, (Any, Any) -> Any?>)
 	{
-		fun handleEvent(scope: Any, event: Event, eventClass: Class<*>)
+		private val mappingCache: MutableMap<Class<*>, ((Any, Any) -> Any?)?> = hashMapOf()
+
+		fun handleEvent(scope: Any, event: Event)
 		{
 			this.eventManager.post(event)
 
-			val childScope: Any = this.childMappings[eventClass]?.invoke(scope, event) ?: return
+			val mapping: (Any, Any) -> Any? = synchronized(this.mappingCache)
+			{
+				this.mappingCache.computeIfAbsent(event.javaClass)
+				{ key ->
+					SpongeHarmonyEventManager.walkHierarchy(key) { child -> this.childMappings[child]?.let { return@computeIfAbsent it } }
+
+					return@computeIfAbsent null
+				}
+			} ?: return
+
+			val childScope: Any = mapping(scope, event) ?: return
 			val scopeData: ScopeData = this.child!!.scopes[childScope] ?: return
 
 			scopeData.eventManager.post(event)