Push for 1.5.1

EncryptSL · Oct 7, 2024 · cdf8db7 · cdf8db7
1 parent 34c9924
commit cdf8db7
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 58 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
     compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
         exclude("org.bukkit", "bukkit")
     }
-    compileOnly("com.zaxxer:HikariCP:5.1.0")
+    compileOnly("com.zaxxer:HikariCP:6.0.0")
     compileOnly("me.clip:placeholderapi:2.11.5")
     compileOnly("org.jetbrains.exposed:exposed-core:0.54.0")
     compileOnly("org.jetbrains.exposed:exposed-jdbc:0.54.0")

diff --git a/src/main/kotlin/com/github/encryptsl/lite/eco/api/economy/ModernLiteEcoEconomyImpl.kt b/src/main/kotlin/com/github/encryptsl/lite/eco/api/economy/ModernLiteEcoEconomyImpl.kt
@@ -15,15 +15,11 @@ import java.util.concurrent.CompletableFuture
 class ModernLiteEcoEconomyImpl : DeprecatedLiteEcoEconomyImpl() {
 
     override fun getUserByUUID(uuid: UUID, currency: String): CompletableFuture<User> {
-        val future = CompletableFuture<User>()
-
-        if (PlayerAccount.isPlayerOnline(uuid) || PlayerAccount.isAccountCached(uuid, currency)) {
-            future.completeAsync { User(Bukkit.getPlayer(uuid)?.name.toString(), uuid, PlayerAccount.getBalance(uuid, currency)) }
+        return if (PlayerAccount.isPlayerOnline(uuid) || PlayerAccount.isAccountCached(uuid, currency)) {
+            CompletableFuture.supplyAsync { User(Bukkit.getPlayer(uuid)?.name.toString(), uuid, PlayerAccount.getBalance(uuid, currency)) }
         } else {
-            return LiteEco.instance.databaseEcoModel.getUserByUUID(uuid, currency)
+            LiteEco.instance.databaseEcoModel.getUserByUUID(uuid, currency)
         }
-
-        return future
     }
 
     override fun deleteAccount(uuid: UUID, currency: String): Boolean {

diff --git a/src/main/kotlin/com/github/encryptsl/lite/eco/commands/MoneyCMD.kt b/src/main/kotlin/com/github/encryptsl/lite/eco/commands/MoneyCMD.kt
@@ -51,7 +51,7 @@ class MoneyCMD(private val liteEco: LiteEco) {
 
         if (commandSender is Player) {
             val cSender = offlinePlayer ?: commandSender
-            liteEco.api.getUserByUUID(cSender.uniqueId, c).thenApply { user ->
+            liteEco.api.getUserByUUID(cSender.uniqueId, c).thenAccept { user ->
                 val formatMessage = when(offlinePlayer) {
                     null -> liteEco.locale.translation("messages.balance.format", helper.getComponentBal(user, c))
                     else -> liteEco.locale.translation("messages.balance.format_target", helper.getComponentBal(user, c))
@@ -60,18 +60,22 @@ class MoneyCMD(private val liteEco: LiteEco) {
             }.exceptionally {
                 commandSender.sendMessage(liteEco.locale.translation("messages.error.account_not_exist",
                     Placeholder.parsed("account", cSender.name.toString())))
+
+                return@exceptionally null
             }
             return
         }
 
         if (offlinePlayer != null) {
-            liteEco.api.getUserByUUID(offlinePlayer.uniqueId, c).thenApply { user ->
+            liteEco.api.getUserByUUID(offlinePlayer.uniqueId, c).thenAccept { user ->
                 commandSender.sendMessage(
                     liteEco.locale.translation("messages.balance.format_target", helper.getComponentBal(user, c))
                 )
             }.exceptionally {
                 commandSender.sendMessage(liteEco.locale.translation("messages.error.account_not_exist",
                     Placeholder.parsed("account", offlinePlayer.name.toString())))
+
+                return@exceptionally null
             }
             return
         }

diff --git a/src/main/kotlin/com/github/encryptsl/lite/eco/common/database/models/DatabaseEcoModel.kt b/src/main/kotlin/com/github/encryptsl/lite/eco/common/database/models/DatabaseEcoModel.kt
@@ -47,19 +47,17 @@ class DatabaseEcoModel : PlayerSQL {
     }
 
     override fun getUserByUUID(uuid: UUID, currency: String): CompletableFuture<User> {
-        val future = CompletableFuture<User>()
-        loggedTransaction {
-            try {
-                val table = Account(currency)
-                val row = table.select(table.uuid, table.username, table.money).where(table.uuid eq uuid).singleOrNull()
-                if (row == null) {
-                    future.completeExceptionally(Exception("User not Found"))
-                } else {
-                    future.completeAsync { User(row[table.username], row[table.uuid], row[table.money]) }
+        val future: CompletableFuture<User> = CompletableFuture.supplyAsync {
+            loggedTransaction {
+                try {
+                    val table = Account(currency)
+                    val row = table.select(table.uuid, table.username, table.money).where(table.uuid eq uuid).single()
+                    User(row[table.username], row[table.uuid], row[table.money])
+                } catch (e : ExposedSQLException) {
+                    LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
+
+                    throw Exception("Something is wrong with fetching user, ${e.message ?: e.localizedMessage}")
                 }
-            } catch (e : ExposedSQLException) {
-                future.completeExceptionally(Exception("Something is wrong with fetching user, ${e.message ?: e.localizedMessage}"))
-                LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
             }
         }
 
@@ -78,14 +76,15 @@ class DatabaseEcoModel : PlayerSQL {
     }
 
     override fun getExistPlayerAccount(uuid: UUID, currency: String): CompletableFuture<Boolean> {
-        val future = CompletableFuture<Boolean>()
-        loggedTransaction {
-            try {
-                val table = Account(currency)
-                future.completeAsync { !table.select(table.uuid).where(table.uuid eq uuid).empty() }
-            } catch (e : ExposedSQLException) {
-                future.completeAsync { false }
-                LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
+        val future: CompletableFuture<Boolean> = CompletableFuture.supplyAsync {
+            loggedTransaction {
+                try {
+                    val table = Account(currency)
+                    !table.select(table.uuid).where(table.uuid eq uuid).empty()
+                } catch (e : ExposedSQLException) {
+                    LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
+                    false
+                }
             }
         }
         return future
@@ -107,14 +106,15 @@ class DatabaseEcoModel : PlayerSQL {
     }
 
     override fun getPlayersIds(currency: String): CompletableFuture<MutableCollection<UUID>> {
-        val future = CompletableFuture<MutableCollection<UUID>>()
-        loggedTransaction {
-            try {
-                val table = Account(currency)
-                future.completeAsync { table.selectAll().map {it[table.uuid] }.toMutableList() }
-            } catch (e : ExposedSQLException) {
-                future.completeAsync { mutableListOf() }
-                LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
+        val future: CompletableFuture<MutableCollection<UUID>> = CompletableFuture.supplyAsync {
+            loggedTransaction {
+                try {
+                    val table = Account(currency)
+                    table.selectAll().map {it[table.uuid] }.toMutableList()
+                } catch (e : ExposedSQLException) {
+                    LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
+                    mutableListOf()
+                }
             }
         }
         return future

diff --git a/src/main/kotlin/com/github/encryptsl/lite/eco/common/database/models/DatabaseMonologModel.kt b/src/main/kotlin/com/github/encryptsl/lite/eco/common/database/models/DatabaseMonologModel.kt
@@ -30,13 +30,14 @@ class DatabaseMonologModel(val plugin: Plugin) : AdapterLogger {
     }
 
     override fun getLog(): CompletableFuture<List<EconomyLog>> {
-        val future = CompletableFuture<List<EconomyLog>>()
-        val log = loggedTransaction {
-            MonologTable.selectAll().orderBy(MonologTable.timestamp, SortOrder.DESC).mapNotNull {
-                     EconomyLog(it[MonologTable.level], it[MonologTable.log], it[MonologTable.timestamp])
+        val future: CompletableFuture<List<EconomyLog>> = CompletableFuture.supplyAsync {
+            loggedTransaction {
+                MonologTable.selectAll().orderBy(MonologTable.timestamp, SortOrder.DESC).mapNotNull {
+                    EconomyLog(it[MonologTable.level], it[MonologTable.log], it[MonologTable.timestamp])
+                }
             }
         }
-        return future.completeAsync { log }
+        return future
     }
 
     private fun log(level: Level, message: String) {

diff --git a/src/main/kotlin/com/github/encryptsl/lite/eco/listeners/AccountManageListener.kt b/src/main/kotlin/com/github/encryptsl/lite/eco/listeners/AccountManageListener.kt
@@ -21,9 +21,11 @@ class AccountManageListener(private val liteEco: LiteEco) : Listener {
             }
             OperationType.CACHING_ACCOUNT -> {
                 for (currency in liteEco.currencyImpl.getCurrenciesKeys()) {
-                    liteEco.databaseEcoModel.getUserByUUID(uuid, currency).thenAccept {
+                    val future = liteEco.databaseEcoModel.getUserByUUID(uuid, currency).thenAccept {
                         liteEco.api.cacheAccount(uuid, currency, it.money)
                     }
+                    liteEco.logger.info("Account $uuid was cached into memory !")
+                    future.join()
                 }
             }
             OperationType.SYNC_ACCOUNT -> liteEco.api.syncAccount(uuid)

diff --git a/src/main/kotlin/com/github/encryptsl/lite/eco/listeners/admin/EconomyMoneyDepositListener.kt b/src/main/kotlin/com/github/encryptsl/lite/eco/listeners/admin/EconomyMoneyDepositListener.kt
@@ -32,7 +32,7 @@ class EconomyMoneyDepositListener(private val liteEco: LiteEco) : Listener {
                     Placeholder.parsed("account", target.name.toString())
                 ))
 
-        liteEco.api.getUserByUUID(target.uniqueId, currency).thenApply {
+        liteEco.api.getUserByUUID(target.uniqueId, currency).thenAccept {
             liteEco.increaseTransactions(1)
             liteEco.api.depositMoney(target.uniqueId, currency, money)
             liteEco.loggerModel.info(liteEco.locale.plainTextTranslation("messages.monolog.admin.normal.deposit", TagResolver.resolver(
@@ -42,7 +42,8 @@ class EconomyMoneyDepositListener(private val liteEco: LiteEco) : Listener {
                 Placeholder.parsed("currency", liteEco.currencyImpl.currencyModularNameConvert(currency, money))
             )))
         }.exceptionally {
-            return@exceptionally sender.sendMessage(liteEco.locale.translation("messages.error.account_not_exist", Placeholder.parsed("account", target.name.toString())))
+            sender.sendMessage(liteEco.locale.translation("messages.error.account_not_exist", Placeholder.parsed("account", target.name.toString())))
+            return@exceptionally null
         }
 
         if (sender.name == target.name) {

diff --git a/src/main/kotlin/com/github/encryptsl/lite/eco/listeners/admin/EconomyMoneySetListener.kt b/src/main/kotlin/com/github/encryptsl/lite/eco/listeners/admin/EconomyMoneySetListener.kt
@@ -25,7 +25,7 @@ class EconomyMoneySetListener(private val liteEco: LiteEco) : Listener {
         if (liteEco.api.getCheckBalanceLimit(money) && !sender.hasPermission("lite.eco.admin.bypass.limit"))
             return sender.sendMessage(liteEco.locale.translation("messages.error.amount_above_limit"))
 
-        liteEco.api.getUserByUUID(target.uniqueId).thenApply {
+        liteEco.api.getUserByUUID(target.uniqueId).thenAccept {
             liteEco.increaseTransactions(1)
 
             liteEco.api.setMoney(target.uniqueId, currency, money)
@@ -37,6 +37,7 @@ class EconomyMoneySetListener(private val liteEco: LiteEco) : Listener {
             )))
         }.exceptionally {
             sender.sendMessage(liteEco.locale.translation("messages.error.account_not_exist", Placeholder.parsed("account", target.name.toString())))
+            return@exceptionally null
         }
 
         if (sender.name == target.name)

diff --git a/...main/kotlin/com/github/encryptsl/lite/eco/listeners/admin/EconomyMoneyWithdrawListener.kt b/...main/kotlin/com/github/encryptsl/lite/eco/listeners/admin/EconomyMoneyWithdrawListener.kt
@@ -26,7 +26,7 @@ class EconomyMoneyWithdrawListener(private val liteEco: LiteEco) : Listener {
         if (!liteEco.api.has(target.uniqueId, currency, money))
             return sender.sendMessage(liteEco.locale.translation("messages.error.insufficient_funds"))
 
-        liteEco.api.getUserByUUID(target.uniqueId, currency).thenApply {
+        liteEco.api.getUserByUUID(target.uniqueId, currency).thenAccept {
             liteEco.increaseTransactions(1)
             liteEco.api.withDrawMoney(target, currency, money)
             liteEco.loggerModel.info(liteEco.locale.plainTextTranslation("messages.monolog.admin.normal.withdraw", TagResolver.resolver(
@@ -36,8 +36,10 @@ class EconomyMoneyWithdrawListener(private val liteEco: LiteEco) : Listener {
                 Placeholder.parsed("currency", liteEco.currencyImpl.currencyModularNameConvert(currency, money))
             )))
         }.exceptionally {
-           sender.sendMessage(
-                liteEco.locale.translation("messages.error.account_not_exist", Placeholder.parsed("account", target.name.toString())))
+            sender.sendMessage(liteEco.locale.translation("messages.error.account_not_exist",
+                Placeholder.parsed("account", target.name.toString())
+            ))
+            return@exceptionally null
         }
 
         if (sender.name == target.name)

diff --git a/src/main/resources/paper-libraries.yml b/src/main/resources/paper-libraries.yml
@@ -1,7 +1,7 @@
 libraries:
-  - com.zaxxer:HikariCP:5.1.0
+  - com.zaxxer:HikariCP:6.0.0
   - org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.20
-  - org.jetbrains.exposed:exposed-core:0.54.0
-  - org.jetbrains.exposed:exposed-jdbc:0.54.0
-  - org.jetbrains.exposed:exposed-kotlin-datetime:0.54.0
+  - org.jetbrains.exposed:exposed-core:0.55.0
+  - org.jetbrains.exposed:exposed-jdbc:0.55.0
+  - org.jetbrains.exposed:exposed-kotlin-datetime:0.55.0
   - com.squareup.okhttp3:okhttp:4.12.0
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -13,11 +13,11 @@ website: https://encryptsl.github.io
 load: STARTUP
 softdepend: [PlaceholderAPI, Vault, Treasury, MiniPlaceholders]
 libraries:
-  - com.zaxxer:HikariCP:5.1.0
+  - com.zaxxer:HikariCP:6.0.0
   - org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.20
-  - org.jetbrains.exposed:exposed-core:0.54.0
-  - org.jetbrains.exposed:exposed-jdbc:0.54.0
-  - org.jetbrains.exposed:exposed-kotlin-datetime:0.54.0
+  - org.jetbrains.exposed:exposed-core:0.55.0
+  - org.jetbrains.exposed:exposed-jdbc:0.55.0
+  - org.jetbrains.exposed:exposed-kotlin-datetime:0.55.0
   - com.squareup.okhttp3:okhttp:4.12.0
 
 description: ${description}