Add 1.21.6 support

Author: SamB440

api/src/main/java/com/convallyria/forcepack/api/resourcepack/PackFormatResolver.java

@@ -4,6 +4,8 @@ public final class PackFormatResolver {
 
     public static int getPackFormat(int protocol) {
         switch (protocol) {
+            case 771: // 1.21.6
+                return 63;
             case 770: // 1.21.5
                 return 55;
             case 769: // 1.21.4

combined/build.gradle.kts

@@ -34,6 +34,6 @@ modrinth {
         "1.18", "1.18.1", "1.18.2",
         "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4",
         "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
-        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5")
+        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6")
     loaders.addAll("bukkit", "folia", "paper", "spigot", "velocity")
-}
+}

spigot/build.gradle.kts

@@ -13,15 +13,24 @@ repositories {
             includeGroup("com.github.LoneDev6")
         }
     }
+    maven {
+        name = "grimacSnapshots"
+        url = uri("https://repo.grim.ac/snapshots")
+        content {
+            includeGroup("com.github.retrooper")
+            includeGroup("ac.grim.grimac")
+            includeGroup("ac.grim.packetevents")
+        }
+    }
     maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://repo.codemc.io/repository/maven-snapshots/")
 }
 
 configurations {
     all {
         resolutionStrategy {
-            force("net.kyori:adventure-api:4.19.0")
-            force("net.kyori:adventure-bom:4.19.0")
+            force("net.kyori:adventure-api:4.22.0")
+            force("net.kyori:adventure-bom:4.22.0")
         }
     }
 }
@@ -31,7 +40,7 @@ dependencies {
     implementation(project(":folia"))
     implementation(project(":webserver", "shadow"))
 
-    compileOnly("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT") {
+    compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") {
         exclude("net.kyori") // avoid conflicts
     }
     compileOnly("com.viaversion:viaversion-api:4.9.2")
@@ -41,15 +50,15 @@ dependencies {
     implementation("org.incendo:cloud-paper:2.0.0-beta.10") {
         exclude("org.checkerframework")
     }
-    implementation("net.kyori:adventure-platform-bukkit:4.3.4") {
+    implementation("net.kyori:adventure-platform-bukkit:4.4.0") {
         exclude("net.kyori", "adventure-api") // not up-to-date - use minimessage version
     }
-    implementation("net.kyori:adventure-text-minimessage:4.19.0")
+    implementation("net.kyori:adventure-text-minimessage:4.22.0")
     implementation("com.convallyria.languagy:api:3.0.3-SNAPSHOT") {
         exclude("com.convallyria.languagy.libs")
     }
     implementation("org.bstats:bstats-bukkit:3.0.2")
-    implementation("com.github.GrimAnticheat.PacketEvents:packetevents-spigot:2.0-SNAPSHOT")
+    implementation("ac.grim.packetevents:packetevents-spigot:2.9.0+09654a9-SNAPSHOT")
 }
 
 tasks {

sponge/build.gradle.kts

@@ -46,7 +46,7 @@ dependencies {
     implementation(project(":api"))
     implementation(project(":webserver", "shadow"))
     // TODO use grim fork
-    implementation("com.github.retrooper:packetevents-sponge:2.8.0-SNAPSHOT")
+    implementation("com.github.retrooper:packetevents-sponge:2.9.0-SNAPSHOT")
     implementation("org.bstats:bstats-sponge:3.0.2")
     implementation("org.incendo:cloud-sponge:2.0.0-SNAPSHOT") {
         exclude("org.checkerframework")
@@ -74,6 +74,6 @@ tasks {
 modrinth {
     uploadFile.set(tasks.shadowJar)
     versionName.set(versionName.get() + " - Sponge")
-    gameVersions.addAll("1.21.4", "1.21.5") // Must be an array, even with only one version
+    gameVersions.addAll("1.21.4", "1.21.5", "1.21.6") // Must be an array, even with only one version
     loaders.addAll("sponge") // Must also be an array - no need to specify this if you're using Loom or ForgeGradle
 }