merges pr 45 and 46 resolving conflicts

.gitignore

@@ -118,4 +118,5 @@ src/main/java/dev/unnm3d/redischat/utils/Metrics.java
 build/
 
 # Gradle
-.gradle
+.gradle
+gradlew.bat

build.gradle

@@ -28,29 +28,31 @@ dependencies {
 
     implementation 'com.github.Exlll.ConfigLib:configlib-paper:v4.5.0'
 
-    implementation 'xyz.xenondevs.invui:invui-core:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r15:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r16:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r17:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r18:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r19:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r20:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r21:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r22:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r23:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r24:1.47'
-    implementation 'xyz.xenondevs.invui:inventory-access-r25:1.47'
-    compileOnly 'dev.jorel:commandapi-paper-core:11.0.0'
-    implementation "net.william278.uniform:uniform-paper:1.3.8"
+    implementation 'xyz.xenondevs.invui:invui-core:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r15:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r16:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r17:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r18:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r19:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r20:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r21:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r22:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r23:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r24:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r25:1.49'
+    implementation 'xyz.xenondevs.invui:inventory-access-r26:1.49'
+    implementation "net.william278.uniform:uniform-paper:1.3.9"
 
     implementation 'com.github.Anon8281:UniversalScheduler:0.1.6'
 
 
-    compileOnly 'io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT'
-    compileOnly 'me.clip:placeholderapi:2.11.6'
-    compileOnly 'io.lettuce:lettuce-core:6.5.3.RELEASE'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
-    compileOnly 'com.zaxxer:HikariCP:5.1.0'
+    compileOnly 'dev.jorel:commandapi-paper-core:11.1.0'
+    compileOnly 'dev.jorel:commandapi-spigot-core:11.1.0'
+    compileOnly 'io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT'
+    compileOnly 'me.clip:placeholderapi:2.11.7'
+    compileOnly 'io.lettuce:lettuce-core:6.5.5.RELEASE'
+    compileOnly 'org.jetbrains:annotations:26.0.1'
+    compileOnly 'com.zaxxer:HikariCP:6.2.1'
     compileOnly 'net.luckperms:api:5.4'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7' exclude(group: 'org.bukkit', module: 'bukkit')
     compileOnly 'com.github.oraxen:oraxen:1.162.0'
@@ -68,6 +70,9 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
     testImplementation 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
+    testImplementation("dev.jorel:commandapi-spigot-test-toolkit:11.1.0")
+    testImplementation("dev.jorel:commandapi-paper-test-toolkit:11.1.0")
+    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.72.8")
 
     annotationProcessor 'org.projectlombok:lombok:1.18.34'
 }
@@ -109,6 +114,7 @@ shadowJar {
         include dependency('xyz.xenondevs.invui:inventory-access-r23')
         include dependency('xyz.xenondevs.invui:inventory-access-r24')
         include dependency('xyz.xenondevs.invui:inventory-access-r25')
+        include dependency('xyz.xenondevs.invui:inventory-access-r26')
         include dependency('net.william278.uniform:uniform-paper')
         include dependency('com.github.Anon8281:UniversalScheduler:0.1.6')
     }
@@ -169,4 +175,4 @@ publishing {
 }
 
 jar.dependsOn shadowJar
-clean.delete "$rootDir/target"
+clean.delete "$rootDir/target"

src/main/resources/plugin.yml

@@ -2,18 +2,18 @@ name: RedisChat
 version: '${version}'
 main: dev.unnm3d.redischat.RedisChat
 author: Unnm3d
-api-version: 1.19
+api-version: 1.21
 folia-supported: true
 libraries:
-  - io.lettuce:lettuce-core:6.5.3.RELEASE
+  - io.lettuce:lettuce-core:6.5.5.RELEASE
   - org.yaml:snakeyaml:1.27
   - org.snakeyaml:snakeyaml-engine:2.3
-  - org.jetbrains:annotations:24.1.0
-  - com.zaxxer:HikariCP:5.1.0
+  - org.jetbrains:annotations:26.0.1
+  - com.zaxxer:HikariCP:6.2.1
   - org.xerial:sqlite-jdbc:3.45.3.0
   - org.projectlombok:lombok:1.18.34
   - org.apache.commons:commons-collections4:4.4
-  - net.kyori:adventure-platform-bukkit:4.4.0
+  - net.kyori:adventure-platform-bukkit:4.4.1
 depend:
   - PlaceholderAPI
   - CommandAPI
@@ -22,6 +22,7 @@ softdepend:
   - Spicord
   - PremiumVanish
   - SuperVanish
+  - SayanVanish
 loadbefore:
   - CMI
 commands:

src/test/java/dev/unnm3d/redischat/JsonTests.java

@@ -74,4 +74,4 @@ public void testChatMessageSerialization() {
     }
 
 
-}
+}