update astralibs

gradle.properties

@@ -6,7 +6,7 @@ makeevrserg.java.ktarget=17
 # Project
 makeevrserg.project.name=AstraMarket
 makeevrserg.project.group=ru.astrainteractive.astramarket
-makeevrserg.project.version.string=1.10.1
+makeevrserg.project.version.string=1.11.0-RC1
 makeevrserg.project.description=Market plugin for EmpireSMP
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://empireprojekt.ru

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ minecraft-protocollib = "4.8.0"
 minecraft-wg = "7.0.7"
 minecraft-vault = "1.7"
 minecraft-coreprotect = "21.2"
-minecraft-astralibs = "2.25.2"
+minecraft-astralibs = "2.28.0"
 minecraft-bstats = "3.0.0"
 minecraft-mockbukkit = "v1.19-SNAPSHOT"
 

modules/api-market/src/main/kotlin/ru/astrainteractive/astramarket/api/market/dto/MarketSlot.kt

@@ -1,13 +1,13 @@
 package ru.astrainteractive.astramarket.api.market.dto
 
-import ru.astrainteractive.astralibs.encoding.IO
+import ru.astrainteractive.astralibs.encoding.model.EncodedObject
 
 data class MarketSlot(
     val id: Int,
     val discordId: String?,
     val minecraftUuid: String,
     val time: Long,
-    val item: IO.ByteArray,
+    val item: EncodedObject.ByteArray,
     val price: Float,
     var expired: Boolean,
 )

modules/api-market/src/main/kotlin/ru/astrainteractive/astramarket/api/market/mapping/AuctionMapper.kt

@@ -1,6 +1,6 @@
 package ru.astrainteractive.astramarket.api.market.mapping
 
-import ru.astrainteractive.astralibs.encoding.IO
+import ru.astrainteractive.astralibs.encoding.model.EncodedObject
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.db.market.entity.Auction
 import ru.astrainteractive.klibs.mikro.core.domain.Mapper
@@ -15,7 +15,7 @@ internal class AuctionMapperImpl : AuctionMapper {
             discordId = it.discordId,
             minecraftUuid = it.minecraftUuid,
             time = it.time,
-            item = IO.ByteArray(it.item),
+            item = EncodedObject.ByteArray(it.item),
             price = it.price,
             expired = it.expired == 1
         )

modules/api-market/src/test/java/AuctionsTests.kt → modules/api-market/src/test/java/ru/astrainteractive/astramarket/api/market/MarketApiTest.kt

@@ -1,8 +1,9 @@
+package ru.astrainteractive.astramarket.api.market
+
 import kotlinx.coroutines.runBlocking
-import ru.astrainteractive.astralibs.encoding.IO
+import ru.astrainteractive.astralibs.encoding.model.EncodedObject
 import ru.astrainteractive.astralibs.orm.DBConnection
 import ru.astrainteractive.astralibs.orm.DBSyntax
-import ru.astrainteractive.astramarket.api.market.MarketApi
 import ru.astrainteractive.astramarket.db.market.entity.AuctionTable
 import ru.astrainteractive.astramarket.di.ApiMarketModule
 import ru.astrainteractive.klibs.mikro.core.dispatchers.DefaultKotlinDispatchers
@@ -14,7 +15,7 @@ import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class AuctionsTests {
+class MarketApiTest {
     private val moduleFactory = {
         ApiMarketModule.Default(
             dispatchers = DefaultKotlinDispatchers,
@@ -32,7 +33,7 @@ class AuctionsTests {
             discordId = UUID.randomUUID().toString(),
             minecraftUuid = UUID.randomUUID().toString(),
             time = System.currentTimeMillis(),
-            item = IO.ByteArray(ByteArray(0)),
+            item = EncodedObject.ByteArray(ByteArray(0)),
             price = Random.nextInt().toFloat(),
             expired = false
         )
@@ -43,7 +44,7 @@ class AuctionsTests {
         val module = moduleFactory.invoke()
         module.database.openConnection()
         AuctionTable.create(module.database)
-        this@AuctionsTests.module = module
+        this@MarketApiTest.module = module
     }
 
     @AfterTest

modules/core/src/main/kotlin/ru/astrainteractive/astramarket/core/di/CoreModule.kt

@@ -4,6 +4,8 @@ import ru.astrainteractive.astralibs.async.AsyncComponent
 import ru.astrainteractive.astralibs.economy.EconomyProvider
 import ru.astrainteractive.astralibs.filemanager.impl.JVMResourceFileManager
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
+import ru.astrainteractive.astralibs.serialization.SerializerExt.parse
+import ru.astrainteractive.astralibs.serialization.SerializerExt.writeIntoFile
 import ru.astrainteractive.astralibs.serialization.YamlSerializer
 import ru.astrainteractive.astramarket.core.PluginConfig
 import ru.astrainteractive.astramarket.core.Translation

modules/shared/src/bukkitMain/kotlin/ru/astrainteractive/astramarket/data/bridge/BukkitAuctionsBridge.kt

@@ -3,17 +3,17 @@ package ru.astrainteractive.astramarket.data.bridge
 import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.inventory.ItemStack
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.permission.BukkitPermissibleExt.toPermissible
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.core.PluginPermission
 import java.util.UUID
 
 @Suppress("TooManyFunctions")
 class BukkitAuctionsBridge(
-    private val encoder: Encoder,
+    private val encoder: ObjectEncoder,
 ) : AuctionsBridge {
-    private fun MarketSlot.itemStack(serializer: Encoder): ItemStack {
+    private fun MarketSlot.itemStack(serializer: ObjectEncoder): ItemStack {
         return serializer.fromByteArray(item)
     }
 

modules/shared/src/bukkitMain/kotlin/ru/astrainteractive/astramarket/data/di/BukkitSharedDataModule.kt

@@ -1,6 +1,6 @@
 package ru.astrainteractive.astramarket.data.di
 
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.data.bridge.AuctionsBridge
 import ru.astrainteractive.astramarket.data.bridge.BukkitAuctionsBridge
@@ -10,7 +10,7 @@ import ru.astrainteractive.klibs.kdi.Provider
 import ru.astrainteractive.klibs.kdi.getValue
 
 class BukkitSharedDataModule(
-    encoder: Encoder,
+    encoder: ObjectEncoder,
     stringSerializer: KyoriComponentSerializer,
 ) : SharedDataModule {
     override val auctionBridge: AuctionsBridge by Provider {

modules/shared/src/bukkitMain/kotlin/ru/astrainteractive/astramarket/domain/di/BukkitSharedDomainModule.kt

@@ -1,12 +1,12 @@
 package ru.astrainteractive.astramarket.domain.di
 
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astramarket.domain.usecase.BukkitSortAuctionsUseCase
 import ru.astrainteractive.astramarket.domain.usecase.SortAuctionsUseCase
 import ru.astrainteractive.klibs.kdi.Provider
 import ru.astrainteractive.klibs.kdi.getValue
 
-class BukkitSharedDomainModule(encoder: Encoder) : PlatformSharedDomainModule {
+class BukkitSharedDomainModule(encoder: ObjectEncoder) : PlatformSharedDomainModule {
     override val sortAuctionsUseCase: SortAuctionsUseCase by Provider {
         BukkitSortAuctionsUseCase(
             encoder = encoder

modules/shared/src/bukkitMain/kotlin/ru/astrainteractive/astramarket/domain/usecase/BukkitSortAuctionsUseCase.kt

@@ -2,13 +2,13 @@ package ru.astrainteractive.astramarket.domain.usecase
 
 import org.bukkit.Bukkit
 import org.bukkit.inventory.ItemStack
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.domain.model.AuctionSort
 import java.util.UUID
 
-class BukkitSortAuctionsUseCase(private val encoder: Encoder) : SortAuctionsUseCase {
-    private fun MarketSlot.itemStack(serializer: Encoder): ItemStack {
+class BukkitSortAuctionsUseCase(private val encoder: ObjectEncoder) : SortAuctionsUseCase {
+    private fun MarketSlot.itemStack(serializer: ObjectEncoder): ItemStack {
         return serializer.fromByteArray(
             item
         )

modules/shared/src/main/kotlin/ru/astrainteractive/astramarket/domain/usecase/AuctionBuyUseCase.kt

@@ -1,7 +1,7 @@
 package ru.astrainteractive.astramarket.domain.usecase
 
 import ru.astrainteractive.astralibs.economy.EconomyProvider
-import ru.astrainteractive.astralibs.string.replace
+import ru.astrainteractive.astralibs.string.StringDescExt.replace
 import ru.astrainteractive.astramarket.api.market.MarketApi
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.core.PluginConfig

modules/shared/src/main/kotlin/ru/astrainteractive/astramarket/domain/usecase/CreateAuctionUseCase.kt

@@ -1,6 +1,6 @@
 package ru.astrainteractive.astramarket.domain.usecase
 
-import ru.astrainteractive.astralibs.string.replace
+import ru.astrainteractive.astralibs.string.StringDescExt.replace
 import ru.astrainteractive.astramarket.api.market.MarketApi
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.core.PluginConfig

modules/shared/src/main/kotlin/ru/astrainteractive/astramarket/domain/usecase/ExpireAuctionUseCase.kt

@@ -1,6 +1,6 @@
 package ru.astrainteractive.astramarket.domain.usecase
 
-import ru.astrainteractive.astralibs.string.replace
+import ru.astrainteractive.astralibs.string.StringDescExt.replace
 import ru.astrainteractive.astramarket.api.market.MarketApi
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.core.Translation

spigot/src/main/kotlin/ru/astrainteractive/astramarket/command/auction/di/AuctionCommandDependencies.kt

@@ -2,7 +2,7 @@ package ru.astrainteractive.astramarket.command.auction.di
 
 import kotlinx.coroutines.CoroutineScope
 import org.bukkit.plugin.java.JavaPlugin
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.core.Translation
 import ru.astrainteractive.astramarket.di.RootModule
@@ -17,7 +17,7 @@ interface AuctionCommandDependencies {
     val kyoriComponentSerializer: KyoriComponentSerializer
     val translation: Translation
     val router: GuiRouter
-    val encoder: Encoder
+    val encoder: ObjectEncoder
     val scope: CoroutineScope
     val dispatchers: KotlinDispatchers
     val createAuctionUseCase: CreateAuctionUseCase
@@ -29,7 +29,7 @@ interface AuctionCommandDependencies {
         override val router: GuiRouter by Provider {
             rootModule.auctionGuiModule.router
         }
-        override val encoder: Encoder by Provider {
+        override val encoder: ObjectEncoder by Provider {
             rootModule.bukkitCoreModule.encoder.value
         }
         override val scope: CoroutineScope by rootModule.coreModule.scope

spigot/src/main/kotlin/ru/astrainteractive/astramarket/di/BukkitCoreModule.kt

@@ -1,6 +1,6 @@
 package ru.astrainteractive.astramarket.di
 
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.event.EventListener
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
 import ru.astrainteractive.astralibs.logging.Logger
@@ -14,7 +14,7 @@ interface BukkitCoreModule {
     val lifecycle: Lifecycle
 
     val plugin: Lateinit<AstraMarket>
-    val encoder: Single<Encoder>
+    val encoder: Single<ObjectEncoder>
 
     val inventoryClickEventListener: Single<EventListener>
     val logger: Single<Logger>

spigot/src/main/kotlin/ru/astrainteractive/astramarket/di/impl/BukkitCoreModuleImpl.kt

@@ -1,8 +1,8 @@
 package ru.astrainteractive.astramarket.di.impl
 
 import org.bstats.bukkit.Metrics
-import ru.astrainteractive.astralibs.encoding.BukkitIOStreamProvider
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.BukkitObjectEncoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.event.EventListener
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
 import ru.astrainteractive.astralibs.logging.JUtilFileLogger
@@ -22,8 +22,8 @@ class BukkitCoreModuleImpl : BukkitCoreModule {
 
     override val plugin: Lateinit<AstraMarket> = Lateinit<AstraMarket>()
 
-    override val encoder: Single<Encoder> = Single {
-        Encoder(BukkitIOStreamProvider)
+    override val encoder: Single<ObjectEncoder> = Single {
+        BukkitObjectEncoder()
     }
 
     override val inventoryClickEventListener: Single<EventListener> = Single {

spigot/src/main/kotlin/ru/astrainteractive/astramarket/presentation/auctions/AuctionGui.kt

@@ -9,7 +9,7 @@ import ru.astrainteractive.astralibs.menu.menu.editMeta
 import ru.astrainteractive.astralibs.menu.menu.setIndex
 import ru.astrainteractive.astralibs.menu.menu.setItemStack
 import ru.astrainteractive.astralibs.menu.menu.setOnClickListener
-import ru.astrainteractive.astralibs.string.replace
+import ru.astrainteractive.astralibs.string.StringDescExt.replace
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.presentation.AuctionComponent
 import ru.astrainteractive.astramarket.presentation.base.AbstractAuctionGui

spigot/src/main/kotlin/ru/astrainteractive/astramarket/presentation/base/AbstractAuctionGui.kt

@@ -17,7 +17,7 @@ import ru.astrainteractive.astralibs.menu.menu.setIndex
 import ru.astrainteractive.astralibs.menu.menu.setItemStack
 import ru.astrainteractive.astralibs.menu.menu.setOnClickListener
 import ru.astrainteractive.astralibs.string.StringDesc
-import ru.astrainteractive.astralibs.string.replace
+import ru.astrainteractive.astralibs.string.StringDescExt.replace
 import ru.astrainteractive.astramarket.presentation.AuctionComponent
 import ru.astrainteractive.astramarket.presentation.base.di.AuctionGuiDependencies
 import ru.astrainteractive.astramarket.presentation.util.ItemStackExt.playSound

spigot/src/main/kotlin/ru/astrainteractive/astramarket/presentation/base/di/AuctionGuiDependencies.kt

@@ -1,6 +1,6 @@
 package ru.astrainteractive.astramarket.presentation.base.di
 
-import ru.astrainteractive.astralibs.encoding.Encoder
+import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.core.PluginConfig
 import ru.astrainteractive.astramarket.core.Translation
@@ -18,7 +18,7 @@ interface AuctionGuiDependencies {
     val translation: Translation
     val dispatchers: KotlinDispatchers
     val sortTranslationMapping: AuctionSortTranslationMapping
-    val serializer: Encoder
+    val serializer: ObjectEncoder
     val kyoriComponentSerializer: KyoriComponentSerializer
     val router: GuiRouter
 
@@ -34,7 +34,7 @@ interface AuctionGuiDependencies {
         override val sortTranslationMapping: AuctionSortTranslationMapping by Provider {
             sharedDomainModule.auctionSortTranslationMapping
         }
-        override val serializer: Encoder by bukkitCoreModule.encoder
+        override val serializer: ObjectEncoder by bukkitCoreModule.encoder
         override val kyoriComponentSerializer: KyoriComponentSerializer by bukkitCoreModule.kyoriComponentSerializer
     }
 }

spigot/src/main/kotlin/ru/astrainteractive/astramarket/presentation/expired/ExpiredAuctionGui.kt

@@ -10,7 +10,7 @@ import ru.astrainteractive.astralibs.menu.menu.editMeta
 import ru.astrainteractive.astralibs.menu.menu.setIndex
 import ru.astrainteractive.astralibs.menu.menu.setItemStack
 import ru.astrainteractive.astralibs.menu.menu.setOnClickListener
-import ru.astrainteractive.astralibs.string.replace
+import ru.astrainteractive.astralibs.string.StringDescExt.replace
 import ru.astrainteractive.astramarket.api.market.dto.MarketSlot
 import ru.astrainteractive.astramarket.presentation.AuctionComponent
 import ru.astrainteractive.astramarket.presentation.base.AbstractAuctionGui