Velocity queueing solution

Update gradle, update dependencies

Changed files
+30 -57
.idea
ProxyQueuesAPI
gradle
src
main
java
uk
co
notnull
proxyqueues
+15 -13
.idea/compiler.xml
··· 5 5 <profile name="Gradle Imported" enabled="true"> 6 6 <outputRelativeToContentRoot value="true" /> 7 7 <processorPath useClasspath="false"> 8 - <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/com.velocitypowered/velocity-api/3.1.2-SNAPSHOT/f6ef4800fb5be1acd9327e81ddd7cde5eaedd605/velocity-api-3.1.2-SNAPSHOT.jar" /> 8 + <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/com.velocitypowered/velocity-api/3.2.0-SNAPSHOT/4a1205dc65a280d6e36b6884dfb3f5cfabc8eb9d/velocity-api-3.2.0-SNAPSHOT.jar" /> 9 9 <entry name="$MAVEN_REPOSITORY$/com/moandjiezana/toml/toml4j/0.7.2/toml4j-0.7.2.jar" /> 10 10 <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/org.spongepowered/configurate-gson/3.7.3/4facb1a9abd996fa3cce45dd128997765f50f75b/configurate-gson-3.7.3.jar" /> 11 - <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-minimessage/4.12.0/c587ced911b95ee3d1ee1c6738ea643f858c826b/adventure-text-minimessage-4.12.0.jar" /> 12 - <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-legacy/4.12.0/e27192a793d85b40ef0cf885d45e766c611f91bd/adventure-text-serializer-legacy-4.12.0.jar" /> 13 - <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-plain/4.12.0/e0711d65c29676908cda8bee2bd1d12f02b16e46/adventure-text-serializer-plain-4.12.0.jar" /> 14 - <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/net.kyori/adventure-api/4.12.0/f2351c9766a9c68e9535fa5157699f44ef53d8be/adventure-api-4.12.0.jar" /> 15 - <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/net.kyori/adventure-key/4.12.0/c5c1e8a4f0664b91e3116e5ecdd8d271362d4ae9/adventure-key-4.12.0.jar" /> 16 - <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-gson/4.12.0/74405a444d9a7f23f2a20811562d0a6cc6251966/adventure-text-serializer-gson-4.12.0.jar" /> 17 - <entry name="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar" /> 11 + <entry name="$MAVEN_REPOSITORY$/net/kyori/adventure-text-serializer-gson/4.13.1/adventure-text-serializer-gson-4.13.1.jar" /> 12 + <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.10.1/b3add478d4382b78ea20b1671390a858002feb6c/gson-2.10.1.jar" /> 18 13 <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/org.spongepowered/configurate-hocon/3.7.3/630e0562bd9b809428b55742aabe382f0347211f/configurate-hocon-3.7.3.jar" /> 19 14 <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/org.spongepowered/configurate-yaml/3.7.3/5329d80a00c1e053ceaeb94d8325cb7de349409c/configurate-yaml-3.7.3.jar" /> 20 15 <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/org.spongepowered/configurate-core/3.7.3/f852a1d0e336eb07c1f45ed1dc275b7d6a6d676a/configurate-core-3.7.3.jar" /> 21 - <entry name="$MAVEN_REPOSITORY$/com/google/inject/guice/5.0.1/guice-5.0.1.jar" /> 22 - <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar" /> 16 + <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/com.google.inject/guice/6.0.0/9b422c69c4fa1ea95b2615444a94fede9b02fc40/guice-6.0.0.jar" /> 17 + <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar" /> 18 + <entry name="$MAVEN_REPOSITORY$/net/kyori/adventure-text-minimessage/4.13.1/adventure-text-minimessage-4.13.1.jar" /> 19 + <entry name="$MAVEN_REPOSITORY$/net/kyori/adventure-text-serializer-legacy/4.13.1/adventure-text-serializer-legacy-4.13.1.jar" /> 20 + <entry name="$MAVEN_REPOSITORY$/net/kyori/adventure-text-serializer-plain/4.13.1/adventure-text-serializer-plain-4.13.1.jar" /> 21 + <entry name="$MAVEN_REPOSITORY$/net/kyori/adventure-api/4.13.1/adventure-api-4.13.1.jar" /> 23 22 <entry name="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" /> 24 - <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.6.1/checker-qual-3.6.1.jar" /> 23 + <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/com.github.ben-manes.caffeine/caffeine/3.1.5/566c9b18953d9c7e916ab6823bf404899dccfefd/caffeine-3.1.5.jar" /> 24 + <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.32.0/54ebd61f46b58b862c779e034073a93489ab3faf/checker-qual-3.32.0.jar" /> 25 25 <entry name="$MAVEN_REPOSITORY$/com/velocitypowered/velocity-brigadier/1.0.0-SNAPSHOT/velocity-brigadier-1.0.0-SNAPSHOT.jar" /> 26 26 <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" /> 27 - <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar" /> 27 + <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.18.0/89b684257096f548fa39a7df9fdaa409d4d4df91/error_prone_annotations-2.18.0.jar" /> 28 28 <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" /> 29 + <entry name="$MAVEN_REPOSITORY$/net/kyori/adventure-key/4.13.1/adventure-key-4.13.1.jar" /> 29 30 <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" /> 31 + <entry name="$USER_HOME$/.local/share/gradle/caches/modules-2/files-2.1/jakarta.inject/jakarta.inject-api/2.0.1/4c28afe1991a941d7702fe1362c365f0a8641d1e/jakarta.inject-api-2.0.1.jar" /> 30 32 <entry name="$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" /> 31 33 <entry name="$MAVEN_REPOSITORY$/com/typesafe/config/1.4.0/config-1.4.0.jar" /> 32 34 <entry name="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar" /> 33 35 <entry name="$MAVEN_REPOSITORY$/net/kyori/examination-string/1.3.0/examination-string-1.3.0.jar" /> 34 36 <entry name="$MAVEN_REPOSITORY$/net/kyori/examination-api/1.3.0/examination-api-1.3.0.jar" /> 37 + <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/24.0.1/annotations-24.0.1.jar" /> 35 38 <entry name="$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" /> 36 39 <entry name="$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" /> 37 - <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/22.0.0/annotations-22.0.0.jar" /> 38 40 </processorPath> 39 41 <module name="ProxyQueues.main" /> 40 42 </profile>
-12
.idea/modules/ProxyQueues.test.iml
··· 1 - <?xml version="1.0" encoding="UTF-8"?> 2 - <module version="4"> 3 - <component name="FacetManager"> 4 - <facet type="minecraft" name="Minecraft"> 5 - <configuration> 6 - <autoDetectTypes> 7 - <platformType>ADVENTURE</platformType> 8 - </autoDetectTypes> 9 - </configuration> 10 - </facet> 11 - </component> 12 - </module>
-13
.idea/modules/ProxyQueuesAPI/ProxyQueues.ProxyQueuesAPI.main.iml
··· 1 - <?xml version="1.0" encoding="UTF-8"?> 2 - <module version="4"> 3 - <component name="FacetManager"> 4 - <facet type="minecraft" name="Minecraft"> 5 - <configuration> 6 - <autoDetectTypes> 7 - <platformType>VELOCITY</platformType> 8 - <platformType>ADVENTURE</platformType> 9 - </autoDetectTypes> 10 - </configuration> 11 - </facet> 12 - </component> 13 - </module>
+2 -5
ProxyQueuesAPI/build.gradle
··· 27 27 } 28 28 29 29 dependencies { 30 - compileOnly 'com.intellij:annotations:12.0' 31 - compileOnly 'com.velocitypowered:velocity-api:3.1.2-SNAPSHOT' 30 + compileOnly 'org.jetbrains:annotations:24.0.1' 31 + compileOnly 'com.velocitypowered:velocity-api:3.2.0-SNAPSHOT' 32 32 } 33 33 34 34 description = 'ProxyQueues API' 35 - 36 - java.sourceCompatibility = JavaVersion.VERSION_17 37 - java.targetCompatibility = JavaVersion.VERSION_17 38 35 39 36 publishing { 40 37 publications {
+11 -12
build.gradle
··· 25 25 26 26 plugins { 27 27 id 'java' 28 - id 'com.github.johnrengelman.shadow' version '7.0.0' 28 + id 'com.github.johnrengelman.shadow' version '8.1.1' 29 29 id 'maven-publish' 30 30 } 31 31 ··· 45 45 mavenCentral() 46 46 maven { url "https://papermc.io/repo/repository/maven-public/" } 47 47 maven { url 'https://repo.not-null.co.uk/releases/' } 48 - maven { url 'https://repo.not-null.co.uk/snapshots/' } 49 48 } 50 49 51 50 compileJava { ··· 56 55 57 56 dependencies { 58 57 implementation project(":ProxyQueuesAPI") 59 - implementation 'ch.jalu:configme:1.1.0' 60 - implementation 'cloud.commandframework:cloud-velocity:1.7.1' 61 - implementation 'cloud.commandframework:cloud-minecraft-extras:1.7.1' 62 - implementation 'cloud.commandframework:cloud-annotations:1.7.1' 63 - implementation 'uk.co.notnull:SuperVanishBridge-helper:1.0-SNAPSHOT' 58 + implementation 'ch.jalu:configme:1.3.0' 59 + implementation 'cloud.commandframework:cloud-velocity:1.8.3' 60 + implementation 'cloud.commandframework:cloud-minecraft-extras:1.8.3' 61 + implementation 'cloud.commandframework:cloud-annotations:1.8.3' 62 + implementation 'uk.co.notnull:SuperVanishBridge-helper:1.0' 64 63 65 - compileOnly 'com.intellij:annotations:12.0' 66 - compileOnly 'com.velocitypowered:velocity-api:3.1.2-SNAPSHOT' 67 - compileOnly 'uk.co.notnull:PlatformDetection-velocity:2.0' 68 - compileOnly 'uk.co.notnull:ProxyDiscordAPI:1.1-SNAPSHOT' 64 + compileOnly 'org.jetbrains:annotations:24.0.1' 65 + compileOnly 'com.velocitypowered:velocity-api:3.2.0-SNAPSHOT' 66 + compileOnly 'uk.co.notnull:PlatformDetection-velocity:2.1' 67 + compileOnly 'uk.co.notnull:ProxyDiscordAPI:1.1' 69 68 compileOnly 'io.prometheus:simpleclient_common:0.11.0' 70 69 71 - annotationProcessor 'com.velocitypowered:velocity-api:3.1.2-SNAPSHOT' 70 + annotationProcessor 'com.velocitypowered:velocity-api:3.2.0-SNAPSHOT' 72 71 } 73 72 74 73 description = 'Velocity queueing solution'
+1 -1
gradle/wrapper/gradle-wrapper.properties
··· 23 23 24 24 distributionBase=GRADLE_USER_HOME 25 25 distributionPath=wrapper/dists 26 - distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip 26 + distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip 27 27 zipStoreBase=GRADLE_USER_HOME 28 28 zipStorePath=wrapper/dists
+1 -1
src/main/java/uk/co/notnull/proxyqueues/queues/ProxyQueueNotifier.java
··· 26 26 import com.velocitypowered.api.plugin.PluginContainer; 27 27 import com.velocitypowered.api.proxy.InboundConnection; 28 28 import net.kyori.adventure.title.Title; 29 + import org.jetbrains.annotations.Nullable; 29 30 import uk.co.notnull.platformdetection.PlatformDetectionVelocity; 30 31 import uk.co.notnull.proxyqueues.Messages; 31 32 import uk.co.notnull.proxyqueues.ProxyQueuesImpl; ··· 33 34 import uk.co.notnull.proxyqueues.api.queues.QueuePlayer; 34 35 import uk.co.notnull.proxyqueues.configuration.sections.ConfigOptions; 35 36 36 - import javax.annotation.Nullable; 37 37 import java.util.Collections; 38 38 import java.util.Map; 39 39 import java.util.Optional;