updated AstraLibs to 2.1.1

Astra-Interactive · Jan 14, 2023 · 8c90e7e · 8c90e7e
1 parent 72bd7e3
commit 8c90e7e
Show file tree

Hide file tree

Showing 25 changed files with 97 additions and 71 deletions.
diff --git a/build-logic/plugins/convention/src/main/kotlin/basic-java.gradle.kts b/build-logic/plugins/convention/src/main/kotlin/basic-java.gradle.kts
@@ -27,14 +27,11 @@ tasks {
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions.jvmTarget = "17"
     }
-    withType<Jar> {
-        archiveClassifier.set("min")
-    }
     compileJava {
         options.encoding = "UTF-8"
     }
     test {
-        useJUnit()
+        useJUnitPlatform()
         testLogging {
             events("passed", "skipped", "failed")
             this.showStandardStreams = true

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     implementation(libs.kotlin.serializationKaml)
     // AstraLibs
     implementation(libs.astralibs.ktxCore)
+    implementation(libs.astralibs.orm)
     // Test
     testImplementation(kotlin("test"))
     testImplementation(libs.orgTesting)

diff --git a/domain/src/main/kotlin/com/astrainteractive/astratemplate/domain/Repository.kt b/domain/src/main/kotlin/com/astrainteractive/astratemplate/domain/Repository.kt
@@ -1,14 +1,13 @@
 package com.astrainteractive.astratemplate.domain
 
-import com.astrainteractive.astratemplate.domain.local.dto.RatingDTO
 import com.astrainteractive.astratemplate.domain.local.dto.UserDTO
 import com.astrainteractive.astratemplate.domain.local.dto.mapping.UserMapper
 import com.astrainteractive.astratemplate.domain.local.entities.RatingRelationTable
 import com.astrainteractive.astratemplate.domain.local.entities.User
 import com.astrainteractive.astratemplate.domain.local.entities.UserRating
 import com.astrainteractive.astratemplate.domain.local.entities.UserTable
 import com.astrainteractive.astratemplate.domain.remote.RestApi
-import ru.astrainteractive.astralibs.database_v2.Database
+import ru.astrainteractive.astralibs.orm.Database
 import java.util.*
 import kotlin.random.Random
 
@@ -39,13 +38,13 @@ class Repository(
     }
 
     suspend fun selectRating(user: UserDTO): List<UserRating>? {
-        return RatingRelationTable.find(databaseDataSource, ::UserRating) {
+        return RatingRelationTable.find(databaseDataSource, UserRating) {
             RatingRelationTable.userID.eq(user.id)
         }
     }
 
     suspend fun updateUser(user: UserDTO) {
-        UserTable.find(constructor = ::User) {
+        UserTable.find(constructor = User) {
             UserTable.id.eq(user.id)
         }.firstOrNull()?.apply {
             this.minecraftUuid = user.minecraftUUID
@@ -64,7 +63,7 @@ class Repository(
      * Same as [createUserTable]
      */
     suspend fun getAllUsers(): List<UserDTO>? {
-        return UserTable.all(databaseDataSource, ::User).map(UserMapper::toDTO)
+        return UserTable.all(databaseDataSource, User).map(UserMapper::toDTO)
     }
 }
 
diff --git a/...c/main/kotlin/com/astrainteractive/astratemplate/domain/local/dto/mapping/RatingMapper.kt b/...c/main/kotlin/com/astrainteractive/astratemplate/domain/local/dto/mapping/RatingMapper.kt
@@ -8,7 +8,7 @@ import ru.astrainteractive.astralibs.domain.mapping.IMapper
 interface IRatingMapper : IMapper<UserRating, RatingDTO>
 object RatingMapper : IRatingMapper {
     override fun fromDTO(it: RatingDTO): UserRating {
-        return RatingRelationTable.find(constructor = ::UserRating) {
+        return RatingRelationTable.find(constructor = UserRating) {
             RatingRelationTable.id.eq(it.id)
         }.firstOrNull()!!
     }

diff --git a/...src/main/kotlin/com/astrainteractive/astratemplate/domain/local/dto/mapping/UserMapper.kt b/...src/main/kotlin/com/astrainteractive/astratemplate/domain/local/dto/mapping/UserMapper.kt
@@ -12,7 +12,7 @@ interface IUserMapper : IMapper<User, UserDTO>
 
 object UserMapper : IUserMapper {
     override fun fromDTO(it: UserDTO): User {
-        return UserTable.find(constructor = ::User) {
+        return UserTable.find(constructor = User) {
             UserTable.id.eq(it.id)
         }.firstOrNull()!!
     }

diff --git a/...rc/main/kotlin/com/astrainteractive/astratemplate/domain/local/entities/RatingRelation.kt b/...rc/main/kotlin/com/astrainteractive/astratemplate/domain/local/entities/RatingRelation.kt
@@ -1,18 +1,18 @@
 package com.astrainteractive.astratemplate.domain.local.entities
 
-import ru.astrainteractive.astralibs.database.ColumnInfo
-import ru.astrainteractive.astralibs.database.Entity
-import ru.astrainteractive.astralibs.database.PrimaryKey
-import ru.astrainteractive.astralibs.database_v2.Column
-import ru.astrainteractive.astralibs.database_v2.Table
+import ru.astrainteractive.astralibs.orm.database.Column
+import ru.astrainteractive.astralibs.orm.database.Constructable
+import ru.astrainteractive.astralibs.orm.database.Entity
+import ru.astrainteractive.astralibs.orm.database.Table
 
 object RatingRelationTable : Table<Int>("rating") {
     override val id: Column<Int> = integer("id").primaryKey().autoIncrement()
     val userID = integer("user_id")
     val reason = text("reason")
 }
-class UserRating : ru.astrainteractive.astralibs.database_v2.Entity<Int>(RatingRelationTable){
+class UserRating : Entity<Int>(RatingRelationTable){
     val id by RatingRelationTable.id
     val userID by RatingRelationTable.userID
     val reason by RatingRelationTable.reason
+    companion object: Constructable<UserRating>(::UserRating)
 }
diff --git a/domain/src/main/kotlin/com/astrainteractive/astratemplate/domain/local/entities/User.kt b/domain/src/main/kotlin/com/astrainteractive/astratemplate/domain/local/entities/User.kt
@@ -1,19 +1,20 @@
 package com.astrainteractive.astratemplate.domain.local.entities
 
-import ru.astrainteractive.astralibs.database.ColumnInfo
-import ru.astrainteractive.astralibs.database.Entity
-import ru.astrainteractive.astralibs.database.PrimaryKey
-import ru.astrainteractive.astralibs.database_v2.Column
-import ru.astrainteractive.astralibs.database_v2.Table
+import ru.astrainteractive.astralibs.orm.database.Column
+import ru.astrainteractive.astralibs.orm.database.Constructable
+import ru.astrainteractive.astralibs.orm.database.Entity
+import ru.astrainteractive.astralibs.orm.database.Table
+
 
 object UserTable : Table<Int>("users") {
     override val id: Column<Int> = integer("id").primaryKey().autoIncrement()
     val discordId = text("discord_id")
     val minecraftUuid = text("minecraft_uuid")
 }
 
-class User : ru.astrainteractive.astralibs.database_v2.Entity<Int>(UserTable) {
+class User : Entity<Int>(UserTable) {
     val id by UserTable.id
     var discordId by UserTable.discordId
     var minecraftUuid by UserTable.minecraftUuid
+    companion object: Constructable<User>(::User)
 }
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     modImplementation(libs.fabric.api.get())
     // AstraLibs
     implementation(libs.astralibs.ktxCore)
+    implementation(libs.astralibs.orm)
     implementation(libs.xerialSqliteJdbcLib)
     implementation(project(":domain"))
 }

diff --git a/fabric/src/main/java/ru/astrainteractive/astratemplate/modules.kt b/fabric/src/main/java/ru/astrainteractive/astratemplate/modules.kt
@@ -6,15 +6,16 @@ import com.astrainteractive.astratemplate.domain.local.entities.UserTable
 import com.astrainteractive.astratemplate.domain.remote.RestApi
 import com.google.gson.Gson
 import kotlinx.coroutines.runBlocking
-import ru.astrainteractive.astralibs.database_v2.Database
 import ru.astrainteractive.astralibs.di.module
+import ru.astrainteractive.astralibs.orm.DBConnection
+import ru.astrainteractive.astralibs.orm.Database
 import ru.astrainteractive.astralibs.rest.RestRequester
 import java.io.File
 
 val sqlModule = module {
     runBlocking {
         val database = Database()
-        database.openConnection("jdbc:sqlite:data.db", "org.sqlite.JDBC")
+        database.openConnection("data.db", DBConnection.SQLite)
         UserTable.create(database)
         RatingRelationTable.create(database)
         database

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Plugin/Mod core
-plugin = "4.1.0"
+plugin = "4.2.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.17"
+astraLibs = "2.1.1"
 mysqlDriver = "8.0.20"
 xerialSqliteJdbcVersion = "3.34.0"
 # Build
@@ -60,6 +60,8 @@ kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", v
 kotlin-serializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "json" }
 kotlin-serializationKaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kaml" }
 astralibs-ktxCore = { module = "ru.astrainteractive.astralibs:ktx-core", version.ref = "astraLibs" }
+astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "astraLibs" }
+astralibs-spigotGui = { module = "ru.astrainteractive.astralibs:spigot-gui", 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" }

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -16,6 +16,8 @@ dependencies {
     implementation(libs.kotlin.serializationKaml)
     // AstraLibs
     implementation(libs.astralibs.ktxCore)
+    implementation(libs.astralibs.orm)
+    implementation(libs.astralibs.spigotGui)
     implementation(libs.astralibs.spigotCore)
     implementation(libs.bstats.bukkit)
     // Spigot dependencies

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/AstraTemplate.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/AstraTemplate.kt
@@ -10,18 +10,20 @@ import org.bukkit.plugin.java.JavaPlugin
 import ru.astrainteractive.astralibs.AstraLibs
 import ru.astrainteractive.astralibs.Logger
 import ru.astrainteractive.astralibs.async.PluginScope
+import ru.astrainteractive.astralibs.di.getValue
 import ru.astrainteractive.astralibs.events.GlobalEventManager
+import ru.astrainteractive.astralibs.menu.SharedInventoryClickEvent
 import ru.astrainteractive.astratemplate.events.EventHandler
 import ru.astrainteractive.astratemplate.modules.PluginConfigModule
+import ru.astrainteractive.astratemplate.modules.eventHandlerModule
 import ru.astrainteractive.astratemplate.utils.Files
+import ru.astrainteractive.astratemplate.utils.Singleton
 
 /**
  * Initial class for your plugin
  */
 class AstraTemplate : JavaPlugin() {
-    companion object {
-        lateinit var instance: AstraTemplate
-    }
+    companion object : Singleton<AstraTemplate>()
 
     init {
         instance = this
@@ -30,7 +32,8 @@ class AstraTemplate : JavaPlugin() {
     /**
      * Class for handling all of your events
      */
-    private var eventHandler: EventHandler? = null
+    private val eventHandler: EventHandler by eventHandlerModule
+
 
 
     /**
@@ -39,8 +42,9 @@ class AstraTemplate : JavaPlugin() {
     override fun onEnable() {
         AstraLibs.rememberPlugin(this)
         Logger.prefix = "AstraTemplate"
-        eventHandler = EventHandler()
+        eventHandler.onEnable()
         CommandManager()
+        SharedInventoryClickEvent.onEnable(GlobalEventManager)
         Logger.log("Logger enabled", "AstraTemplate")
         Logger.warn("Warn message from logger", "AstraTemplate")
         Logger.error("Error message", "AstraTemplate")
@@ -50,7 +54,7 @@ class AstraTemplate : JavaPlugin() {
      * This method called when server is shutting down or when PlugMan disable plugin.
      */
     override fun onDisable() {
-        eventHandler?.onDisable()
+        eventHandler.onDisable()
         runBlocking { SQLDatabaseModule.value.closeConnection() }
         HandlerList.unregisterAll(this)
         GlobalEventManager.onDisable()

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/AddCommand.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/AddCommand.kt
@@ -6,13 +6,15 @@ import org.bukkit.Material
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import ru.astrainteractive.astralibs.AstraLibs
-import ru.astrainteractive.astralibs.utils.registerCommand
-import ru.astrainteractive.astralibs.utils.registerTabCompleter
+import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astralibs.commands.registerTabCompleter
 import ru.astrainteractive.astralibs.utils.withEntry
+import ru.astrainteractive.astratemplate.AstraTemplate
 
 
-fun CommandManager.addCommandCompleter() = AstraLibs.registerTabCompleter("add") { sender, args ->
-    if (args.size == 0)
+
+fun CommandManager.addCommandCompleter() = AstraTemplate.instance.registerTabCompleter("add") {
+    if (args.isEmpty())
         return@registerTabCompleter Bukkit.getOnlinePlayers().map { it.name }.withEntry(args.last())
 
     if (args.size == 1)
@@ -27,7 +29,7 @@ fun CommandManager.addCommandCompleter() = AstraLibs.registerTabCompleter("add")
 /**
  * Add {PLAYER} {ITEM} [AMOUNT]
  */
-fun CommandManager.addCommand() = AstraLibs.registerCommand("add") { sender, args ->
+fun CommandManager.addCommand() = AstraTemplate.instance.registerCommand("add") {
     if (sender !is Player) {
         sender.sendMessage("Sender should be player")
         return@registerCommand

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/CommandManager.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/CommandManager.kt
@@ -1,6 +1,7 @@
 import ru.astrainteractive.astralibs.AstraLibs
+import ru.astrainteractive.astralibs.commands.registerCommand
 import ru.astrainteractive.astralibs.di.getValue
-import ru.astrainteractive.astralibs.utils.registerCommand
+import ru.astrainteractive.astratemplate.AstraTemplate
 import ru.astrainteractive.astratemplate.commands.*
 import ru.astrainteractive.astratemplate.modules.TranslationModule
 
@@ -31,7 +32,7 @@ class CommandManager {
         RandomRickAndMortyCharacter()
 
         // It shows that [val XXX by IReloadable] is actually affected by reloading
-        AstraLibs.registerCommand("translation") { sender, _ ->
+        AstraTemplate.instance.registerCommand("translation") {
             sender.sendMessage(translation.getByByCheck)
         }
     }

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/Damage.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/Damage.kt
@@ -4,8 +4,9 @@ import CommandManager
 import ru.astrainteractive.astratemplate.commands.Arguments.Companion.getArgumentString
 import org.bukkit.Bukkit
 import ru.astrainteractive.astralibs.AstraLibs
-import ru.astrainteractive.astralibs.utils.registerCommand
-import ru.astrainteractive.astralibs.utils.registerTabCompleter
+import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astralibs.commands.registerTabCompleter
+import ru.astrainteractive.astratemplate.AstraTemplate
 import ru.astrainteractive.astratemplate.utils.AstraPermission
 
 /**
@@ -25,7 +26,7 @@ private class Arguments {
 }
 
 
-fun CommandManager.damageCompleter() = AstraLibs.registerTabCompleter("adamage") { sender, args ->
+fun CommandManager.damageCompleter() = AstraTemplate.instance.registerTabCompleter("adamage") {
     return@registerTabCompleter when (args.size) {
         0 -> listOf("adamage")
         1 -> Bukkit.getOnlinePlayers().map { it.name }
@@ -35,7 +36,7 @@ fun CommandManager.damageCompleter() = AstraLibs.registerTabCompleter("adamage")
 
 }
 
-fun CommandManager.damageCommand() = AstraLibs.registerCommand("adamage") { sender, args ->
+fun CommandManager.damageCommand() = AstraTemplate.instance.registerCommand("adamage") {
     if (!AstraPermission.Damage.hasPermission(sender)) {
         sender.sendMessage(translation.noPermission)
         return@registerCommand

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/EmpireTabCompleter.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/EmpireTabCompleter.kt
@@ -3,13 +3,14 @@ package ru.astrainteractive.astratemplate.commands
 
 import CommandManager
 import ru.astrainteractive.astralibs.AstraLibs
-import ru.astrainteractive.astralibs.utils.registerTabCompleter
+import ru.astrainteractive.astralibs.commands.registerTabCompleter
 import ru.astrainteractive.astralibs.utils.withEntry
+import ru.astrainteractive.astratemplate.AstraTemplate
 
 /**
  * Tab completer for your plugin which is called when player typing commands
  */
-fun CommandManager.tabCompleter() = AstraLibs.registerTabCompleter("atemp") { sender, args ->
+fun CommandManager.tabCompleter() = AstraTemplate.instance.registerTabCompleter("atemp") {
     if (args.isEmpty())
         return@registerTabCompleter listOf("atemp", "atempreload")
     if (args.size == 1)

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/Gui.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/Gui.kt
@@ -7,9 +7,10 @@ import kotlinx.coroutines.launch
 import org.bukkit.entity.Player
 import ru.astrainteractive.astralibs.AstraLibs
 import ru.astrainteractive.astralibs.async.PluginScope
-import ru.astrainteractive.astralibs.utils.registerCommand
+import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astratemplate.AstraTemplate
 
-fun CommandManager.tempGUI() = AstraLibs.registerCommand("atempgui") { sender, args ->
+fun CommandManager.tempGUI() = AstraTemplate.instance.registerCommand("atempgui") {
     if (sender is Player)
-        PluginScope.launch(Dispatchers.IO) { SampleGUI(sender).open() }
+        PluginScope.launch(Dispatchers.IO) { SampleGUI(sender as Player).open() }
 }
diff --git a/...src/main/kotlin/ru/astrainteractive/astratemplate/commands/RandomRickAndMortyCharacter.kt b/...src/main/kotlin/ru/astrainteractive/astratemplate/commands/RandomRickAndMortyCharacter.kt
@@ -6,9 +6,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import ru.astrainteractive.astralibs.AstraLibs
 import ru.astrainteractive.astralibs.async.PluginScope
-import ru.astrainteractive.astralibs.utils.registerCommand
+import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astratemplate.AstraTemplate
 
-fun CommandManager.RandomRickAndMortyCharacter() = AstraLibs.registerCommand("rickandmorty") { sender, args ->
+fun CommandManager.RandomRickAndMortyCharacter() = AstraTemplate.instance.registerCommand("rickandmorty") {
     sender.sendMessage("Working on that...")
     val repository = RepositoryModule.value
     PluginScope.launch(Dispatchers.IO) {

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/Reload.kt b/plugin/src/main/kotlin/ru/astrainteractive/astratemplate/commands/Reload.kt
@@ -4,7 +4,7 @@ import CommandManager
 import ru.astrainteractive.astratemplate.AstraTemplate
 import ru.astrainteractive.astratemplate.modules.TranslationModule
 import ru.astrainteractive.astralibs.AstraLibs
-import ru.astrainteractive.astralibs.utils.registerCommand
+import ru.astrainteractive.astralibs.commands.registerCommand
 import ru.astrainteractive.astratemplate.utils.AstraPermission
 
 /**
@@ -16,7 +16,7 @@ import ru.astrainteractive.astratemplate.utils.AstraPermission
  *
  * Here you should also check for permission
  */
-fun CommandManager.reload() = AstraLibs.registerCommand("atempreload") { sender, args ->
+fun CommandManager.reload() = AstraTemplate.instance.registerCommand("atempreload") {
     val translation = TranslationModule.value
     if (!AstraPermission.Reload.hasPermission(sender)) {
         sender.sendMessage(translation.noPermission)