From d4bc6716d31a5e8f569864b383191f02b5b40743 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Tue, 13 May 2025 12:45:57 +0200 Subject: [PATCH] fix issues with generic dependency --- .../xyz/alexcrea/cuanvil/dependency/DependencyManager.kt | 7 +++++++ .../cuanvil/dependency/plugins/GenericPluginDependency.kt | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt index 1894c8e..ef1e328 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt @@ -82,6 +82,13 @@ object DependencyManager { havenBagsCompatibility = HavenBagsDependency() havenBagsCompatibility!!.redirectListeners() } + + // "Generic" dependencies + + + for (dependency in genericDependencies) { + dependency.redirectListeners() + } } fun handleCompatibilityConfig() { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/GenericPluginDependency.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/GenericPluginDependency.kt index 4ef8bce..7db91dc 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/GenericPluginDependency.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/GenericPluginDependency.kt @@ -10,7 +10,7 @@ abstract class GenericPluginDependency(private val plugin: Plugin) { protected val preAnvil = ArrayList() protected val postAnvil = ArrayList() - fun redirectListeners() { + open fun redirectListeners() { // get PreAnvil and PostAnvil listeners for (registeredListener in PrepareAnvilEvent.getHandlerList().registeredListeners) { @@ -33,13 +33,13 @@ abstract class GenericPluginDependency(private val plugin: Plugin) { protected abstract fun postAnvilEvents(): Collection - fun testPrepareAnvil(event: PrepareAnvilEvent) { + open fun testPrepareAnvil(event: PrepareAnvilEvent) { for (registeredListener in preAnvil) { registeredListener.callEvent(event) } } - fun testAnvilResult(event: InventoryClickEvent): Boolean { + open fun testAnvilResult(event: InventoryClickEvent): Boolean { for (registeredListener in postAnvil) { registeredListener.callEvent(event) }