Add 1.21 support

Updated gradle version Fixed deprecated methods
imDMK · Jul 10, 2024 · a74dd46 · a74dd46
1 parent 9c66766
commit a74dd46
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/doublejump-api/build.gradle.kts b/doublejump-api/build.gradle.kts
@@ -18,16 +18,15 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.9")
 
     testImplementation(platform("org.junit:junit-bom:5.9.1"))
     testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 checkstyle {
@@ -41,6 +40,7 @@ tasks.test {
 }
 
 tasks.withType<JavaCompile> {
+    options.compilerArgs = listOf("-Xlint:deprecation", "-parameters")
     options.encoding = "UTF-8"
-    options.compilerArgs.add("-parameters")
+    options.release = 17
 }
diff --git a/doublejump-core/build.gradle.kts b/doublejump-core/build.gradle.kts
@@ -25,19 +25,19 @@ repositories {
 dependencies {
     implementation(project(":doublejump-api"))
 
-    compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.11.5")
 
-    implementation("dev.triumphteam:triumph-gui:3.1.7")
+    implementation("dev.triumphteam:triumph-gui:3.1.10")
 
     implementation("eu.okaeri:okaeri-configs-yaml-snakeyaml:5.0.1")
     implementation("eu.okaeri:okaeri-configs-serdes-commons:5.0.1")
     implementation("eu.okaeri:okaeri-configs-serdes-bukkit:5.0.1")
 
-    implementation("net.kyori:adventure-platform-bukkit:4.3.2")
-    implementation("net.kyori:adventure-text-minimessage:4.16.0")
+    implementation("net.kyori:adventure-platform-bukkit:4.3.3")
+    implementation("net.kyori:adventure-text-minimessage:4.17.0")
 
-    implementation("dev.rollczi:litecommands-bukkit:3.4.0")
+    implementation("dev.rollczi:litecommands-bukkit:3.4.2")
 
     implementation("com.eternalcode:gitcheck:1.0.0")
     implementation("org.bstats:bstats-bukkit:3.0.2")
@@ -47,8 +47,7 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 bukkit {
@@ -73,7 +72,9 @@ tasks.test {
 }
 
 tasks.withType<JavaCompile> {
+    options.compilerArgs = listOf("-Xlint:deprecation", "-parameters")
     options.encoding = "UTF-8"
+    options.release = 17
 }
 
 tasks.withType<ShadowJar> {

diff --git a/...in/java/com/github/imdmk/doublejump/configuration/transformer/EnchantmentTransformer.java b/...in/java/com/github/imdmk/doublejump/configuration/transformer/EnchantmentTransformer.java
@@ -4,6 +4,7 @@
 import eu.okaeri.configs.serdes.BidirectionalTransformer;
 import eu.okaeri.configs.serdes.SerdesContext;
 import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.enchantments.Enchantment;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -16,7 +17,7 @@ public GenericsPair<String, Enchantment> getPair() {
 
     @Override
     public Enchantment leftToRight(@NonNull String key, @NonNull SerdesContext serdesContext) {
-        return Enchantment.getByKey(NamespacedKey.minecraft(key));
+        return Registry.ENCHANTMENT.get(NamespacedKey.minecraft(key));
     }
 
     @Override

diff --git a/doublejump-core/src/main/java/com/github/imdmk/doublejump/jump/item/JumpItemSettings.java b/doublejump-core/src/main/java/com/github/imdmk/doublejump/jump/item/JumpItemSettings.java
@@ -33,7 +33,7 @@ public class JumpItemSettings extends OkaeriConfig {
             .name(Component.text("<red>DOUBLE JUMP"))
             .lore(Component.empty(), Component.text("<red>This is double jump item!"), Component.empty())
             .flags(ItemFlag.HIDE_ATTRIBUTES)
-            .enchant(Enchantment.DURABILITY, 10)
+            .enchant(Enchantment.INFINITY, 10)
             .build();
 
     @Comment({"# ", "# Jump item usage settings", "# "})

diff --git a/...mp-core/src/main/java/com/github/imdmk/doublejump/jump/particle/JumpParticleSettings.java b/...mp-core/src/main/java/com/github/imdmk/doublejump/jump/particle/JumpParticleSettings.java
@@ -19,7 +19,7 @@ public class JumpParticleSettings extends OkaeriConfig {
     })
     public List<JumpParticle> particles = List.of(
             new JumpParticle(Particle.NOTE, Color.WHITE, 20, 3, 2, 0, 0, 0),
-            new JumpParticle(Particle.REDSTONE, Color.WHITE, 40, 3, 2, 0, 0, 0)
+            new JumpParticle(Particle.BUBBLE, Color.WHITE, 40, 3, 2, 0, 0, 0)
     );
 
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists