1.21.11 support

build.gradle.kts

@@ -6,7 +6,7 @@ subprojects {
     plugins.apply("java-library")
 
     group = "ru.bk.oharass.freedomchat"
-    version = "1.7.6"
+    version = "1.7.7"
     description = "Liberate your server from the chat-reporting bourgeoisie! Disable chat signing server-side."
 
     tasks {

fabric/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("dev.architectury.loom") version "1.11-SNAPSHOT"
-    id("com.gradleup.shadow") version "8.3.9"
+    id("fabric-loom") version "1.14-SNAPSHOT"
+    id("com.gradleup.shadow") version "9.3.0"
 }
 
 val shade: Configuration by configurations.creating
@@ -13,22 +13,26 @@ repositories {
 }
 
 dependencies {
-    minecraft(group = "com.mojang", name = "minecraft", version = "1.21.9")
-    mappings(group = "net.fabricmc", name = "yarn", version = "1.21.9+build.1", classifier = "v2")
-    modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.17.2")
-    modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.133.14+1.21.9")
+    minecraft(group = "com.mojang", name = "minecraft", version = "1.21.11")
+    mappings(group = "net.fabricmc", name = "yarn", version = "1.21.11+build.1", classifier = "v2")
+    modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.18.3")
+    modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.140.0+1.21.11")
     shade(implementation(group = "org.spongepowered", name = "configurate-yaml", version = "4.2.0"))
 }
 
 tasks {
     processResources {
         filesMatching("fabric.mod.json") {
+            // Fixed: expand expects a map
             expand(
-                "version" to project.version,
-                "description" to project.description,
+                mapOf(
+                    "version" to project.version,
+                    "description" to project.description
+                )
             )
         }
     }
+
     shadowJar {
         // Relocate configurate & its dependencies
         relocate("org.spongepowered.configurate", "ru.bk.oharass.freedomchat.lib.org.spongepowered.configurate")
@@ -37,6 +41,7 @@ tasks {
         configurations = listOf(shade)
         archiveClassifier.set("dev")
     }
+
     remapJar {
         inputFile.set(shadowJar.get().archiveFile)
     }

fabric/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java

@@ -23,8 +23,8 @@ public class FreedomChat implements ModInitializer {
     public void onInitialize() {
         ServerLifecycleEvents.SERVER_STARTED.register(server -> {
             this.server = server;
-            if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && SharedConstants.getProtocolVersion() != 773) {
-                logger.warn("This version of FreedomChat only supports protocol version 773 (1.21.9). Please use the appropriate version of FreedomChat for your server");
+            if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && SharedConstants.getProtocolVersion() != 774) {
+                logger.warn("This version of FreedomChat only supports protocol version 774 (1.21.11). Please use the appropriate version of FreedomChat for your server");
                 logger.warn("If you know what you are doing, set the im.evan.freedomchat.bypassprotocolcheck system property to true to bypass this check");
                 return;
             }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

paper/build.gradle.kts

@@ -6,12 +6,12 @@ plugins {
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
 
 dependencies {
-    paperweight.paperDevBundle("1.21.9-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
 }
 
 tasks {
     runServer {
-        minecraftVersion("1.21.9")
+        minecraftVersion("1.21.11")
     }
 
     processResources {

paper/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java

@@ -15,8 +15,8 @@ public class FreedomChat extends JavaPlugin implements Listener {
 
     @Override
     public void onEnable() {
-        if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && this.getServer().getUnsafe().getProtocolVersion() != 773) {
-            getLogger().warning("This version of FreedomChat only supports protocol version 773 (1.21.9). Please use the appropriate version of FreedomChat for your server");
+        if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && this.getServer().getUnsafe().getProtocolVersion() != 774) {
+            getLogger().warning("This version of FreedomChat only supports protocol version 774 (1.21.11). Please use the appropriate version of FreedomChat for your server");
             getLogger().warning("If you know what you are doing, set the im.evan.freedomchat.bypassprotocolcheck system property to true to bypass this check");
             this.getServer().getPluginManager().disablePlugin(this);
             return;

settings.gradle.kts

@@ -1,20 +1,15 @@
-import org.gradle.configurationcache.extensions.capitalized
-
 pluginManagement {
     repositories {
         gradlePluginPortal()
         maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://maven.fabricmc.net/")
-        maven("https://maven.architectury.dev/")
     }
 }
 
 rootProject.name = "FreedomChat"
 
-sequenceOf(
-    "paper",
-    "fabric"
-).forEach {
-    include("${rootProject.name}-${it.capitalized()}")
-    project(":${rootProject.name}-${it.capitalized()}").projectDir = file(it)
+sequenceOf("paper", "fabric").forEach {
+    val capitalized = it.replaceFirstChar { c -> c.titlecase() }
+    include("${rootProject.name}-$capitalized")
+    project(":${rootProject.name}-$capitalized").projectDir = file(it)
 }