updated AstraLibs to 2.0.17; version increased

Astra-Interactive · Jan 4, 2023 · 72bd7e3 · 72bd7e3
1 parent 016846e
commit 72bd7e3
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 36 deletions.
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("basic-java")
 }
-
 dependencies {
     // Kotlin
     implementation(libs.kotlinGradlePlugin)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Plugin/Mod core
-plugin = "4.0.0"
+plugin = "4.1.0"
 name = "AstraTemplate"
 group = "com.astrainteractive"
 description = "Template plugin for EmpireProjekt"
@@ -14,7 +14,7 @@ json = "1.3.3"
 kaml = "0.46.0"
 exposed = "0.38.1"
 jdbc = "3.36.0.3"
-astraLibs = "2.0.13"
+astraLibs = "2.0.17"
 mysqlDriver = "8.0.20"
 xerialSqliteJdbcVersion = "3.34.0"
 # Build
@@ -49,6 +49,7 @@ fabric-api = "0.60.0+1.19.2"
 # Forge
 netMinecraftForge = "5.1.+"
 forge-version = "1.19-41.0.35"
+junit-bom = "5.7.0"
 [libraries]
 # Core
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -60,6 +61,7 @@ kotlin-serializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serializati
 kotlin-serializationKaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kaml" }
 astralibs-ktxCore = { module = "ru.astrainteractive.astralibs:ktx-core", version.ref = "astraLibs" }
 astralibs-spigotCore = { module = "ru.astrainteractive.astralibs:spigot-core", version.ref = "astraLibs" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-bom" }
 xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "jdbc" }
 exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
 exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -18,14 +18,19 @@ dependencies {
     implementation(libs.astralibs.ktxCore)
     implementation(libs.astralibs.spigotCore)
     implementation(libs.bstats.bukkit)
-    // Test
-    testImplementation(kotlin("test"))
-    testImplementation(libs.orgTesting)
     // Spigot dependencies
     compileOnly(libs.essentialsx)
     compileOnly(libs.paperApi)
     compileOnly(libs.spigotApi)
     compileOnly(libs.spigot)
+    // Test-Core
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(kotlin("test-junit5"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    // Test-libs
+    testImplementation(libs.coroutines.core)
+    testImplementation(libs.coroutines.coreJvm)
+    testImplementation(libs.xerial.sqlite.jdbc)
     // Local
     implementation(project(":domain"))
 }
diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/AstraTemplate.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/AstraTemplate.kt
@@ -1,14 +1,15 @@
 package ru.astrainteractive.astratemplate
 
 import CommandManager
+import kotlinx.coroutines.cancel
 import ru.astrainteractive.astratemplate.modules.SQLDatabaseModule
 import ru.astrainteractive.astratemplate.modules.TranslationModule
 import kotlinx.coroutines.runBlocking
 import org.bukkit.event.HandlerList
 import org.bukkit.plugin.java.JavaPlugin
 import ru.astrainteractive.astralibs.AstraLibs
 import ru.astrainteractive.astralibs.Logger
-import ru.astrainteractive.astralibs.ServerVersion
+import ru.astrainteractive.astralibs.async.PluginScope
 import ru.astrainteractive.astralibs.events.GlobalEventManager
 import ru.astrainteractive.astratemplate.events.EventHandler
 import ru.astrainteractive.astratemplate.modules.PluginConfigModule
@@ -53,6 +54,7 @@ class AstraTemplate : JavaPlugin() {
         runBlocking { SQLDatabaseModule.value.closeConnection() }
         HandlerList.unregisterAll(this)
         GlobalEventManager.onDisable()
+        PluginScope.cancel()
     }
 
     /**

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/events/events/MultipleEventsDSL.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/events/events/MultipleEventsDSL.kt
@@ -8,11 +8,11 @@ import ru.astrainteractive.astralibs.events.DSLEvent
  * This is a most convenient way to use bukkit events in kotlin
  */
 class MultipleEventsDSL {
-    val blockBreakEvent = DSLEvent.event(BlockBreakEvent::class.java) {
+    val blockBreakEvent = DSLEvent.event<BlockBreakEvent> {
         println("blockBreakEvent ${it.player.name}")
     }
 
-    val entityDamageEvent = DSLEvent.event(EntityDamageEvent::class.java) {
+    val entityDamageEvent = DSLEvent.event<EntityDamageEvent>{
         println("entityDamageEvent ${it.entity.name}")
     }
 }

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/gui/SampleGUI.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/gui/SampleGUI.kt
@@ -83,8 +83,8 @@ class SampleGUI(player: Player) : PaginatedMenu() {
     }
 
     override fun onInventoryClicked(e: InventoryClickEvent) {
-        super.onInventoryClicked(e)
         e.isCancelled = true
+        handleChangePageClick(e.slot)
         if (e.slot == addUserButton.index)
             addUserButton.onClick(e)
 

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/gui/SampleGUIViewModel.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/gui/SampleGUIViewModel.kt
@@ -98,7 +98,7 @@ class SampleGUIViewModel(
     }
 
     fun onUiCreated() = viewModelScope.launch(Dispatchers.IO) {
-        Logger.log("onUiCreated")
+        Logger.log("SampleGuiViewModel","onUiCreated")
         delay(1000)
         loadItemsState()
     }

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/modules/modules.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/modules/modules.kt
@@ -14,6 +14,7 @@ import ru.astrainteractive.astralibs.di.module
 import ru.astrainteractive.astralibs.di.reloadable
 import ru.astrainteractive.astralibs.di.value
 import ru.astrainteractive.astralibs.rest.RestRequester
+import ru.astrainteractive.astralibs.utils.toClass
 import ru.astrainteractive.astratemplate.api.ItemStackSpigotAPI
 import ru.astrainteractive.astratemplate.gui.SampleGUIViewModel
 import ru.astrainteractive.astratemplate.utils.Files

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/utils/AstraPermission.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/utils/AstraPermission.kt
@@ -1,6 +1,8 @@
 package ru.astrainteractive.astratemplate.utils
 
-sealed class AstraPermission(override val value: String):IPermission {
+import ru.astrainteractive.astralibs.utils.IPermission
+
+sealed class AstraPermission(override val value: String): IPermission {
     object Reload : AstraPermission("astra_template.reload")
     object Damage : AstraPermission("astra_template.damage")
 }
diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/utils/IPermission.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/utils/IPermission.kt
diff --git a/plugin/src/main/resources/META-INF/MANIFEST.MF b/plugin/src/main/resources/META-INF/MANIFEST.MF
diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: ru.astrainteractive.astratemplate.AstraTemplate
-prefix: AstraTemplate
+prefix: '${name}'
 description: '${description}'
 version: '${version}'
 name: '${name}'