Update to 1.21.3

ocelotpotpie · Nov 3, 2024 · 09cc15c · 09cc15c
1 parent abdb14a
commit 09cc15c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ subprojects {
     plugins.apply("java-library")
 
     group = "ru.bk.oharass.freedomchat"
-    version = "1.7.0"
+    version = "1.7.1"
     description = "Liberate your server from the chat-reporting bourgeoisie! Disable chat signing server-side."
 
     tasks {

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("dev.architectury.loom") version "1.6-SNAPSHOT"
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("dev.architectury.loom") version "1.7-SNAPSHOT"
+    id("com.gradleup.shadow") version "8.3.5"
 }
 
 val shade: Configuration by configurations.creating
@@ -13,10 +13,10 @@ repositories {
 }
 
 dependencies {
-    minecraft(group = "com.mojang", name = "minecraft", version = "1.21")
-    mappings(group = "net.fabricmc", name = "yarn", version = "1.21+build.7", classifier = "v2")
-    modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.15.11")
-    modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.100.4+1.21")
+    minecraft(group = "com.mojang", name = "minecraft", version = "1.21.3")
+    mappings(group = "net.fabricmc", name = "yarn", version = "1.21.3+build.2", classifier = "v2")
+    modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.16.9")
+    modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.107.0+1.21.3")
     shade(implementation(group = "org.spongepowered", name = "configurate-yaml", version = "4.1.2"))
 }
 

diff --git a/fabric/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java b/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() != 767) {
-                logger.warn("This version of FreedomChat only supports protocol version 767 (1.21). Please use the appropriate version of FreedomChat for your server");
+            if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && SharedConstants.getProtocolVersion() != 768) {
+                logger.warn("This version of FreedomChat only supports protocol version 768 (1.21.3). 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;
             }
@@ -37,7 +37,7 @@ public void onInitialize() {
             try {
                 config = loader.load();
                 final boolean rewriteChat = config.node("rewrite-chat").getBoolean(true);
-                final boolean claimSecureChatEnforced = config.node("claim-secure-chat-enforced").getBoolean(true);
+                final boolean claimSecureChatEnforced = config.node("claim-secure-chat-enforced").getBoolean(false);
                 final boolean noChatReports = config.node("send-prevents-chat-reports-to-client").getBoolean(false);
                 loader.save(config);
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
@@ -1,17 +1,17 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.7.1"
-    id("xyz.jpenilla.run-paper") version "2.3.0"
+    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
 
 dependencies {
-    paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
 }
 
 tasks {
     runServer {
-        minecraftVersion("1.21")
+        minecraftVersion("1.21.3")
     }
 
     processResources {

diff --git a/paper/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java b/paper/src/main/java/ru/bk/oharass/freedomchat/FreedomChat.java
@@ -14,8 +14,8 @@ public class FreedomChat extends JavaPlugin implements Listener {
 
     @Override
     public void onEnable() {
-        if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && this.getServer().getUnsafe().getProtocolVersion() != 767) {
-            getLogger().warning("This version of FreedomChat only supports protocol version 767 (1.21). Please use the appropriate version of FreedomChat for your server");
+        if (!Boolean.getBoolean("im.evan.freedomchat.bypassprotocolcheck") && this.getServer().getUnsafe().getProtocolVersion() != 768) {
+            getLogger().warning("This version of FreedomChat only supports protocol version 768 (1.21.3). 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;
@@ -26,7 +26,7 @@ public void onEnable() {
 
         final FreedomHandler handler = new FreedomHandler(
                 config.getBoolean("rewrite-chat", true),
-                config.getBoolean("claim-secure-chat-enforced", true),
+                config.getBoolean("claim-secure-chat-enforced", false),
                 config.getBoolean("send-prevents-chat-reports-to-client", false)
         );
 

diff --git a/paper/src/main/resources/config.yml b/paper/src/main/resources/config.yml
@@ -8,7 +8,9 @@ rewrite-chat: true
 # not signing their messages join. In modern versions, clients also
 # require a valid access token to be present for the toast to be hidden.
 # That being said, you may still see the toast even if this option is enabled.
-claim-secure-chat-enforced: true
+# Note that enabling this option may violate Minecraft's usage guidelines.
+# See https://www.minecraft.net/en-us/usage-guidelines for more information.
+claim-secure-chat-enforced: false
 
 # Whether to report the server as secure (disabling chat reporting) to the
 # NoChatReports client mod. This displays a green icon on the server list