Merge pull request #179

fix: cooldown problem and 1.20.6 support

build.gradle

@@ -74,9 +74,9 @@ dependencies {
     implementation 'club.minnced:discord-webhooks:0.8.4'
     implementation 'com.github.cryptomorin:XSeries:9.8.1'
 
-    implementation 'net.kyori:adventure-api:4.15.0'
-    implementation 'net.kyori:adventure-platform-bukkit:4.3.2'
-    implementation 'net.kyori:adventure-text-minimessage:4.15.0'
+    implementation 'net.kyori:adventure-api:4.17.0'
+    implementation 'net.kyori:adventure-platform-bukkit:4.3.3'
+    implementation 'net.kyori:adventure-text-minimessage:4.17.0'
 
     implementation 'com.jeff_media:SpigotUpdateChecker:3.0.3'
 

gradle.properties

@@ -1,2 +1,2 @@
-version=3.10.5
+version=3.10.6
 plugin-name=VelocityReport

src/main/java/ir/syrent/velocityreport/bridge/VelocityBridgeManager.kt

@@ -1,6 +1,5 @@
 package ir.syrent.velocityreport.bridge
 
-import com.google.common.annotations.Beta
 import com.google.common.io.ByteStreams
 import com.google.gson.JsonObject
 import com.velocitypowered.api.proxy.Player

src/main/java/ir/syrent/velocityreport/database/mysql/MySQLExecutor.kt

@@ -49,22 +49,36 @@ abstract class MySQLExecutor(
         hikariConfig.maximumPoolSize = poolingSize.coerceAtLeast(3)
         hikariConfig.poolName = "${Ruom.getPlugin().name.lowercase()}-hikari-pool"
         hikariConfig.initializationFailTimeout = 30000
+
+        hikariConfig.addDataSourceProperty("socketTimeout", TimeUnit.SECONDS.toMillis(30).toString());
+
+        hikariConfig.addDataSourceProperty("characterEncoding", "utf8")
+        hikariConfig.addDataSourceProperty("encoding", "UTF-8")
+        hikariConfig.addDataSourceProperty("useUnicode", "true");
+
+        hikariConfig.addDataSourceProperty("rewriteBatchedStatements", "true");
+        hikariConfig.addDataSourceProperty("jdbcCompliantTruncation", "false");
+
+        hikariConfig.addDataSourceProperty("cachePrepStmts", "true");
+        hikariConfig.addDataSourceProperty("prepStmtCacheSize", "275");
+        hikariConfig.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
+
         hikari = HikariDataSource(hikariConfig)
 
         Ruom.runSync({
-            for (priority in Priority.values().toList()) {
+            for (priority in Priority.entries) {
                 Ruom.debug("Query statements for ${priority.name}: ${queue[priority]?.toMutableList()!!.map { "${it.statement}:${it.statusCode}" }}")
             }
         }, 20, 20)
     }
 
     protected fun tick() {
-        for (priority in Priority.values()) {
-            val queries = queue[priority] ?: mutableListOf()
+        for (priority in Priority.entries) {
+            val queries = queue[priority] ?: continue
             if (queries.isEmpty()) continue
             val removedQueries = HashSet<Query>()
             for (query in queries) {
-                if (query.statusCode == StatusCode.FINISHED.code) removedQueries.add(query)
+                if (query.statusCode == StatusCode.FINISHED.code || query.statusCode == StatusCode.FAILED.code) removedQueries.add(query)
             }
             queries.removeAll(removedQueries)
             for (query in queries.toList()) {

src/main/java/ir/syrent/velocityreport/spigot/storage/Settings.kt

@@ -40,7 +40,7 @@ object Settings {
     var languageConfigVersion = 1
     lateinit var defaultLanguage: String
     var showDependencySuggestions = true
-    var velocitySupport = true
+    var velocitySupport = false
     var debugMode = false
     var bstats = true