updated astralibs

Astra-Interactive · Sep 17, 2023 · 6006f95 · 6006f95
1 parent 0fc7559
commit 6006f95
Show file tree

Hide file tree

Showing 32 changed files with 68 additions and 127 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ makeevrserg.java.ktarget=17
 # Project
 makeevrserg.project.name=AspeKt
 makeevrserg.project.group=ru.astrainteractive.aspekt
-makeevrserg.project.version.string=2.6.5
+makeevrserg.project.version.string=2.7.0-RC1
 makeevrserg.project.description=Essentials plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://empireprojekt.ru

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ minecraft-protocollib = "4.8.0"
 minecraft-wg = "7.0.7"
 minecraft-vault = "1.7"
 minecraft-coreprotect = "21.2"
-minecraft-astralibs = "2.9.0"
+minecraft-astralibs = "2.11.0"
 minecraft-bstats = "3.0.0"
 minecraft-mockbukkit = "v1.19-SNAPSHOT"
 

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/AspeKt.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/AspeKt.kt
@@ -14,7 +14,7 @@ import ru.astrainteractive.aspekt.di.impl.RootModuleImpl
 import ru.astrainteractive.aspekt.event.EventHandler
 import ru.astrainteractive.aspekt.event.di.EventsModule
 import ru.astrainteractive.astralibs.async.PluginScope
-import ru.astrainteractive.astralibs.events.GlobalEventListener
+import ru.astrainteractive.astralibs.event.GlobalEventListener
 import ru.astrainteractive.astralibs.menu.event.GlobalInventoryClickEvent
 import ru.astrainteractive.klibs.kdi.getValue
 

diff --git a/...rc/main/kotlin/ru/astrainteractive/aspekt/adminprivate/data/AdminPrivateRepositoryImpl.kt b/...rc/main/kotlin/ru/astrainteractive/aspekt/adminprivate/data/AdminPrivateRepositoryImpl.kt
@@ -37,7 +37,7 @@ class AdminPrivateRepositoryImpl(
                 this[chunk.uniqueWorldKey] = chunk
             }
         )
-        fileManager.configFile.writeText(ConfigLoader().defaultYaml.encodeToString(newRootConfig))
+        fileManager.configFile.writeText(ConfigLoader().yaml.encodeToString(newRootConfig))
     }
 
     override suspend fun deleteChunk(chunk: AdminChunk) = withContext(limitedDispatcher) {
@@ -47,6 +47,6 @@ class AdminPrivateRepositoryImpl(
                 remove(chunk.uniqueWorldKey)
             }
         )
-        fileManager.configFile.writeText(ConfigLoader().defaultYaml.encodeToString(newRootConfig))
+        fileManager.configFile.writeText(ConfigLoader().yaml.encodeToString(newRootConfig))
     }
 }
diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/AdminPrivate.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/AdminPrivate.kt
@@ -5,10 +5,10 @@ import org.bukkit.entity.Player
 import ru.astrainteractive.aspekt.adminprivate.models.ChunkFlag
 import ru.astrainteractive.aspekt.adminprivate.util.adminChunk
 import ru.astrainteractive.aspekt.plugin.PluginPermission
-import ru.astrainteractive.astralibs.commands.registerCommand
-import ru.astrainteractive.astralibs.commands.registerTabCompleter
-import ru.astrainteractive.astralibs.utils.hex
-import ru.astrainteractive.astralibs.utils.withEntry
+import ru.astrainteractive.astralibs.command.registerCommand
+import ru.astrainteractive.astralibs.command.registerTabCompleter
+import ru.astrainteractive.astralibs.util.hex
+import ru.astrainteractive.astralibs.util.withEntry
 
 /**
  * /adminprivate claim

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/AtemFrame.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/AtemFrame.kt
@@ -3,8 +3,8 @@ package ru.astrainteractive.aspekt.command
 import org.bukkit.entity.ItemFrame
 import org.bukkit.entity.Player
 import ru.astrainteractive.aspekt.plugin.PluginPermission
-import ru.astrainteractive.astralibs.commands.registerCommand
-import ru.astrainteractive.astralibs.commands.registerTabCompleter
+import ru.astrainteractive.astralibs.command.registerCommand
+import ru.astrainteractive.astralibs.command.registerTabCompleter
 
 // atemframe isVisible isFixed radius
 fun CommandManager.atemFrameTabCompleter() = plugin.registerTabCompleter("atemframe") {

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Entities.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Entities.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.tooling.core.UnsafeApi
 import ru.astrainteractive.aspekt.gui.EntitiesGui
 import ru.astrainteractive.aspekt.plugin.PluginPermission
 import ru.astrainteractive.astralibs.async.PluginScope
-import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astralibs.command.registerCommand
 
 fun CommandManager.entities() = plugin.registerCommand("entities") {
     if (!PluginPermission.Entities.hasPermission(sender)) return@registerCommand

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/MaxOnline.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/MaxOnline.kt
@@ -2,7 +2,7 @@ package ru.astrainteractive.aspekt.command
 
 import org.bukkit.Bukkit
 import ru.astrainteractive.aspekt.plugin.PluginPermission
-import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astralibs.command.registerCommand
 
 fun CommandManager.maxOnline() = plugin.registerCommand("maxonline") {
     if (!PluginPermission.MaxOnline.hasPermission(sender)) return@registerCommand

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Menu.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Menu.kt
@@ -4,10 +4,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.bukkit.entity.Player
 import ru.astrainteractive.aspekt.gui.menu.MenuGui
-import ru.astrainteractive.astralibs.commands.registerCommand
-import ru.astrainteractive.astralibs.commands.registerTabCompleter
-import ru.astrainteractive.astralibs.commands.types.PrimitiveArgumentType
-import ru.astrainteractive.astralibs.utils.withEntry
+import ru.astrainteractive.astralibs.command.registerCommand
+import ru.astrainteractive.astralibs.command.registerTabCompleter
+import ru.astrainteractive.astralibs.command.types.PrimitiveArgumentType
+import ru.astrainteractive.astralibs.util.withEntry
 
 fun CommandManager.menuCompleter() = plugin.registerTabCompleter("menu") {
     when {

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Reload.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Reload.kt
@@ -1,7 +1,7 @@
 package ru.astrainteractive.aspekt.command
 
 import ru.astrainteractive.aspekt.plugin.PluginPermission
-import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astralibs.command.registerCommand
 
 /**
  * Reload command handler

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Rtp.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Rtp.kt
@@ -3,9 +3,9 @@ package ru.astrainteractive.aspekt.command
 import com.earth2me.essentials.Essentials
 import com.earth2me.essentials.RandomTeleport
 import org.bukkit.Bukkit
-import ru.astrainteractive.astralibs.commands.registerCommand
-import ru.astrainteractive.astralibs.commands.types.PrimitiveArgumentType
-import ru.astrainteractive.astralibs.utils.hex
+import ru.astrainteractive.astralibs.command.registerCommand
+import ru.astrainteractive.astralibs.command.types.PrimitiveArgumentType
+import ru.astrainteractive.astralibs.util.hex
 
 fun CommandManager.rtp() = plugin.registerCommand("rtp") {
     sender.sendMessage("#db2c18Возможно, вы хотели ввести /tpr".hex())

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Sit.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/Sit.kt
@@ -1,7 +1,7 @@
 package ru.astrainteractive.aspekt.command
 
 import org.bukkit.entity.Player
-import ru.astrainteractive.astralibs.commands.registerCommand
+import ru.astrainteractive.astralibs.command.registerCommand
 
 fun CommandManager.sit() = plugin.registerCommand("sit") {
     (sender as? Player)?.let(sitController::toggleSitPlayer)

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/TellChat.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/command/TellChat.kt
@@ -2,8 +2,8 @@ package ru.astrainteractive.aspekt.command
 
 import org.bukkit.Bukkit
 import ru.astrainteractive.aspekt.plugin.PluginPermission
-import ru.astrainteractive.astralibs.commands.registerCommand
-import ru.astrainteractive.astralibs.utils.hex
+import ru.astrainteractive.astralibs.command.registerCommand
+import ru.astrainteractive.astralibs.util.hex
 
 fun CommandManager.tellChat() = plugin.registerCommand("tellchat") {
     if (!PluginPermission.TellChat.hasPermission(sender)) return@registerCommand

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/RootModule.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/RootModule.kt
@@ -12,7 +12,7 @@ import ru.astrainteractive.aspekt.plugin.PluginTranslation
 import ru.astrainteractive.astralibs.async.AsyncComponent
 import ru.astrainteractive.astralibs.async.BukkitDispatchers
 import ru.astrainteractive.astralibs.economy.EconomyProvider
-import ru.astrainteractive.astralibs.events.EventListener
+import ru.astrainteractive.astralibs.event.EventListener
 import ru.astrainteractive.astralibs.filemanager.FileManager
 import ru.astrainteractive.astralibs.filemanager.SpigotFileManager
 import ru.astrainteractive.astralibs.logging.Logger

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/factories/EconomyProviderFactory.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/factories/EconomyProviderFactory.kt
diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/impl/EventsModuleImpl.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/impl/EventsModuleImpl.kt
@@ -10,7 +10,7 @@ import ru.astrainteractive.aspekt.event.sort.SortController
 import ru.astrainteractive.aspekt.plugin.PluginConfiguration
 import ru.astrainteractive.aspekt.plugin.PluginTranslation
 import ru.astrainteractive.astralibs.async.BukkitDispatchers
-import ru.astrainteractive.astralibs.events.EventListener
+import ru.astrainteractive.astralibs.event.EventListener
 import ru.astrainteractive.klibs.kdi.Provider
 import ru.astrainteractive.klibs.kdi.Single
 import ru.astrainteractive.klibs.kdi.getValue

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/impl/RootModuleImpl.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/di/impl/RootModuleImpl.kt
@@ -6,7 +6,6 @@ import ru.astrainteractive.aspekt.adminprivate.controller.di.AdminPrivateControl
 import ru.astrainteractive.aspekt.command.di.CommandsModule
 import ru.astrainteractive.aspekt.di.ControllersModule
 import ru.astrainteractive.aspekt.di.RootModule
-import ru.astrainteractive.aspekt.di.factories.EconomyProviderFactory
 import ru.astrainteractive.aspekt.di.factories.MenuModelFactory
 import ru.astrainteractive.aspekt.event.di.EventsModule
 import ru.astrainteractive.aspekt.event.discord.DiscordEvent
@@ -16,8 +15,9 @@ import ru.astrainteractive.aspekt.plugin.PluginConfiguration
 import ru.astrainteractive.aspekt.plugin.PluginTranslation
 import ru.astrainteractive.astralibs.async.AsyncComponent
 import ru.astrainteractive.astralibs.async.DefaultBukkitDispatchers
+import ru.astrainteractive.astralibs.economy.AnyEconomyProvider
 import ru.astrainteractive.astralibs.economy.EconomyProvider
-import ru.astrainteractive.astralibs.events.EventListener
+import ru.astrainteractive.astralibs.event.EventListener
 import ru.astrainteractive.astralibs.filemanager.DefaultSpigotFileManager
 import ru.astrainteractive.astralibs.filemanager.FileManager
 import ru.astrainteractive.astralibs.filemanager.SpigotFileManager
@@ -95,7 +95,7 @@ object RootModuleImpl : RootModule {
     }
     override val economyProvider: Reloadable<EconomyProvider?> = Reloadable {
         runCatching {
-            EconomyProviderFactory().create()
+            AnyEconomyProvider(plugin.value)
         }.onFailure { it.printStackTrace() }.getOrNull()
     }
     override val tempFileManager: Reloadable<SpigotFileManager> = Reloadable {

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/adminprivate/AdminPrivateEvent.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/adminprivate/AdminPrivateEvent.kt
@@ -31,7 +31,7 @@ import ru.astrainteractive.aspekt.adminprivate.models.ChunkFlag
 import ru.astrainteractive.aspekt.adminprivate.util.adminChunk
 import ru.astrainteractive.aspekt.event.di.EventsModule
 import ru.astrainteractive.aspekt.plugin.PluginPermission
-import ru.astrainteractive.astralibs.events.DSLEvent
+import ru.astrainteractive.astralibs.event.DSLEvent
 
 class AdminPrivateEvent(
     module: EventsModule

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/crop/AutoCropEvent.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/crop/AutoCropEvent.kt
@@ -6,7 +6,7 @@ import org.bukkit.event.block.Action
 import org.bukkit.event.player.PlayerInteractEvent
 import org.bukkit.inventory.ItemStack
 import ru.astrainteractive.aspekt.event.di.EventsModule
-import ru.astrainteractive.astralibs.events.DSLEvent
+import ru.astrainteractive.astralibs.event.DSLEvent
 import kotlin.random.Random
 
 class AutoCropEvent(

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/di/EventsModule.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/di/EventsModule.kt
@@ -8,7 +8,7 @@ import ru.astrainteractive.aspekt.event.sort.SortController
 import ru.astrainteractive.aspekt.plugin.PluginConfiguration
 import ru.astrainteractive.aspekt.plugin.PluginTranslation
 import ru.astrainteractive.astralibs.async.BukkitDispatchers
-import ru.astrainteractive.astralibs.events.EventListener
+import ru.astrainteractive.astralibs.event.EventListener
 import ru.astrainteractive.klibs.kdi.Module
 
 interface EventsModule : Module {

diff --git a/...src/main/kotlin/ru/astrainteractive/aspekt/event/discord/controllers/DiscordController.kt b/...src/main/kotlin/ru/astrainteractive/aspekt/event/discord/controllers/DiscordController.kt
@@ -8,7 +8,7 @@ import github.scarsz.discordsrv.util.DiscordUtil
 import org.bukkit.Bukkit
 import ru.astrainteractive.aspekt.event.discord.controllers.di.RoleControllerModule
 import ru.astrainteractive.aspekt.plugin.PluginConfiguration
-import ru.astrainteractive.astralibs.utils.uuid
+import ru.astrainteractive.astralibs.util.uuid
 import java.util.UUID
 
 @Suppress("DuplicatedCode")

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/restrictions/RestrictionsEvent.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/restrictions/RestrictionsEvent.kt
@@ -14,7 +14,7 @@ import org.bukkit.event.player.PlayerBucketEmptyEvent
 import org.jetbrains.kotlin.tooling.core.UnsafeApi
 import ru.astrainteractive.aspekt.event.di.EventsModule
 import ru.astrainteractive.aspekt.plugin.PluginConfiguration
-import ru.astrainteractive.astralibs.events.DSLEvent
+import ru.astrainteractive.astralibs.event.DSLEvent
 import ru.astrainteractive.klibs.kdi.Provider
 import ru.astrainteractive.klibs.kdi.getValue
 

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/sit/SitEvent.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/sit/SitEvent.kt
@@ -12,7 +12,7 @@ import org.bukkit.event.player.PlayerTeleportEvent
 import org.jetbrains.kotlin.tooling.core.UnsafeApi
 import org.spigotmc.event.entity.EntityDismountEvent
 import ru.astrainteractive.aspekt.event.di.EventsModule
-import ru.astrainteractive.astralibs.events.DSLEvent
+import ru.astrainteractive.astralibs.event.DSLEvent
 
 class SitEvent(
     module: EventsModule

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/sort/SortEvent.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/sort/SortEvent.kt
@@ -6,7 +6,7 @@ import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import ru.astrainteractive.aspekt.event.di.EventsModule
-import ru.astrainteractive.astralibs.events.DSLEvent
+import ru.astrainteractive.astralibs.event.DSLEvent
 
 class SortEvent(
     module: EventsModule

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/tc/TCEvent.kt b/plugin/src/main/kotlin/ru/astrainteractive/aspekt/event/tc/TCEvent.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.tooling.core.UnsafeApi
 import ru.astrainteractive.aspekt.event.di.EventsModule
 import ru.astrainteractive.aspekt.plugin.PluginConfiguration
 import ru.astrainteractive.astralibs.async.PluginScope
-import ru.astrainteractive.astralibs.events.DSLEvent
+import ru.astrainteractive.astralibs.event.DSLEvent
 import ru.astrainteractive.klibs.kdi.Provider
 import ru.astrainteractive.klibs.kdi.getValue
 import kotlin.random.Random