1.21 support

Closes #110

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Lorenzo0111
+Copyright (c) 2024 Lorenzo0111
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.gradle

@@ -28,12 +28,12 @@ plugins {
     id 'java'
     id 'maven-publish'
     id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "net.kyori.indra.license-header" version "3.1.2"
+    id "net.kyori.indra.license-header" version "3.1.3"
     id "io.github.slimjar" version "1.3.0"
 }
 
 group = 'me.lorenzo0111'
-version = '2.3'
+version = '2.3.1'
 description = 'RocketPlaceholders'
 
 ext {
@@ -51,38 +51,36 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT")
-    compileOnly("me.clip:placeholderapi:2.11.3")
-    compileOnly('org.jetbrains:annotations:24.0.1')
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("me.clip:placeholderapi:2.11.6")
+    compileOnly('org.jetbrains:annotations:24.1.0')
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
     compileOnly("be.maximvdw:MVdWPlaceholderAPI:3.0.1-SNAPSHOT") {
         exclude module: 'spigot'
     }
 
     implementation("io.github.slimjar:slimjar:1.2.8")
     implementation("com.github.glyart:mystral:1.4.6-SNAPSHOT")
-    implementation("dev.triumphteam:triumph-gui:3.2")
+    implementation("dev.triumphteam:triumph-gui:3.2.2")
     implementation("org.bstats:bstats-bukkit:3.0.2")
-    implementation('com.github.cryptomorin:XSeries:9.4.0')
-    implementation('net.kyori:adventure-api:4.14.0')
-    implementation('net.kyori:adventure-text-serializer-legacy:4.14.0')
+    implementation('com.github.cryptomorin:XSeries:11.0.0')
+    implementation('net.kyori:adventure-api:4.17.0')
+    implementation('net.kyori:adventure-text-serializer-legacy:4.17.0')
     implementation("com.github.l1m0n3:HexiTextLib:b9e30055b7") {
         exclude module: "annotations"
     }
 
-    slim("mysql:mysql-connector-java:8.0.33")
-    slim("commons-io:commons-io:2.13.0")
+    slim("com.mysql:mysql-connector-j:8.4.0")
+    slim("commons-io:commons-io:2.16.1")
 }
 
 shadowJar {
     relocate("com.glyart.mystral", "${libsBase}mystral")
     relocate("org.checkerframework", "${libsBase}checkerframework")
     relocate("com.zaxxer.hikari", "${libsBase}hikari")
-    relocate("com.google.gson", "${libsBase}gson")
     relocate("org.bstats", "${libsBase}bstats")
     relocate("dev.triumphteam.gui", "${libsBase}gui")
-    relocate("net.kyori.adventure", "${libsBase}adventure")
-    relocate("net.kyori.examination", "${libsBase}examination")
+    relocate("net.kyori", "${libsBase}kyori")
     relocate("com.cryptomorin.xseries", "${libsBase}xseries")
     relocate("io.github.slimjar", "${libsBase}slimjar")
     relocate("com.haroldstudios.hexitextlib", "${libsBase}hex")
@@ -91,7 +89,6 @@ shadowJar {
 }
 
 slimJar {
-    relocate("com.mysql", "${libsBase}mysql")
     relocate("org.apache.commons.io","${libsBase}io")
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail