fix papi expansion

Astra-Interactive · Jun 9, 2024 · 8c143b7 · 8c143b7
1 parent 5a78849
commit 8c143b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraRating
 makeevrserg.project.group=ru.astrainteractive.astrarating
-makeevrserg.project.version.string=1.17.0
+makeevrserg.project.version.string=1.17.1
 makeevrserg.project.description=Rating plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

diff --git a/...i/src/main/kotlin/ru/astrainteractive/astrarating/integration/papi/RatingPAPILifecycle.kt b/...i/src/main/kotlin/ru/astrainteractive/astrarating/integration/papi/RatingPAPILifecycle.kt
@@ -10,7 +10,11 @@ internal class RatingPAPILifecycle(dependencies: PapiDependencies) : Lifecycle {
         get() = Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null
 
     override fun onEnable() {
-        if (!isPapiExists) return
+        if (!isPapiExists) {
+            Bukkit.getLogger().warning("Could not find PlaceholderAPI. Placeholders disabled")
+            return
+        }
+        Bukkit.getLogger().warning("Found PlaceholderAPI. Placeholders are now enabled")
         if (expansion.isRegistered) {
             expansion.unregister()
         }

diff --git a/...on-papi/src/main/kotlin/ru/astrainteractive/astrarating/integration/papi/di/PapiModule.kt b/...on-papi/src/main/kotlin/ru/astrainteractive/astrarating/integration/papi/di/PapiModule.kt
@@ -9,7 +9,7 @@ import ru.astrainteractive.klibs.kdi.Dependency
 import ru.astrainteractive.klibs.kdi.getValue
 
 interface PapiModule {
-    val ratingPAPILifecycle: Lifecycle
+    val lifecycle: Lifecycle
 
     class Default(
         cachedApi: CachedApi,
@@ -21,7 +21,7 @@ interface PapiModule {
             override val config by config
             override val scope: CoroutineScope = scope
         }
-        override val ratingPAPILifecycle: Lifecycle by lazy {
+        override val lifecycle: Lifecycle by lazy {
             RatingPAPILifecycle(papiDependencies)
         }
     }

diff --git a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/AstraRating.kt b/spigot/src/main/kotlin/ru/astrainteractive/astrarating/AstraRating.kt
@@ -10,12 +10,13 @@ import ru.astrainteractive.astrarating.di.impl.RootModuleImpl
 class AstraRating : JavaPlugin() {
     private val rootModule = RootModuleImpl()
     private val lifecycles: List<Lifecycle>
-        get() = listOf(
+        get() = listOfNotNull(
             rootModule.coreModule.lifecycle,
             rootModule.bukkitModule.lifecycle,
             rootModule.dbRatingModule.lifecycle,
             rootModule.commandsModule.lifecycle,
             rootModule.eventModule.lifecycle,
+            rootModule.papiModule?.lifecycle
         )
 
     init {