From a94415e4271345b0fdfe1c132363fc1ad455f924 Mon Sep 17 00:00:00 2001
From: Bloemenpot <71632717+Bloemenpot@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:35:20 +0100
Subject: [PATCH] Update to 1.20.4 (#7)

* Updated Gradle Version

* Updated Loom Version

* Updated GradleProperties to 1.21.4

* Updated needed classes to 1.21.4

* Update mod version

---------

Co-authored-by: CPTProgrammer <46586216+CPTProgrammer@users.noreply.github.com>
---
 build.gradle                                          |  2 +-
 gradle.properties                                     | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties              |  2 +-
 .../java/cn/revaria/chatplus/mixin/MixinChat.java     | 11 ++++++-----
 src/main/resources/fabric.mod.json                    |  4 ++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 23dffac..c9af6ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.5-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
index 669d584..cdd5733 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.6
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.9
 
 # Mod Properties
-mod_version=0.20.3
+mod_version=0.21.0
 maven_group=cn.revaria.chatplus
 archives_base_name=chat-plus
 
 # Dependencies
-fabric_version=0.95.1+1.20.4
\ No newline at end of file
+fabric_version=0.115.0+1.21.4
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..cea7a79 100644
--- 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/cn/revaria/chatplus/mixin/MixinChat.java b/src/main/java/cn/revaria/chatplus/mixin/MixinChat.java
index 138471b..29ad12f 100644
--- a/src/main/java/cn/revaria/chatplus/mixin/MixinChat.java
+++ b/src/main/java/cn/revaria/chatplus/mixin/MixinChat.java
@@ -1,7 +1,6 @@
 package cn.revaria.chatplus.mixin;
 
 import net.minecraft.MinecraftVersion;
-import net.minecraft.SharedConstants;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.message.*;
@@ -14,6 +13,7 @@ import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.util.StringHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -44,7 +44,9 @@ public abstract class MixinChat extends ServerCommonNetworkHandler {
 	@Shadow
 	public ServerPlayerEntity player;
 
-	@Shadow protected abstract Optional<LastSeenMessageList> validateMessage(LastSeenMessageList.Acknowledgment acknowledgment);
+//	@Shadow protected abstract Optional<LastSeenMessageList> validateMessage(LastSeenMessageList.Acknowledgment acknowledgment);
+	
+	@Shadow protected abstract Optional<LastSeenMessageList> validateAcknowledgment(LastSeenMessageList.Acknowledgment acknowledgment);
 
 	@Shadow protected abstract SignedMessage getSignedMessage(ChatMessageC2SPacket packet, LastSeenMessageList lastSeenMessages) throws MessageChain.MessageChainException;
 
@@ -61,8 +63,7 @@ public abstract class MixinChat extends ServerCommonNetworkHandler {
 		if (hasIllegalCharacter(packet.chatMessage())) {
 			disconnect(Text.translatable("multiplayer.disconnect.illegal_characters"));
 		} else {
-			Optional<LastSeenMessageList> optional = this.validateMessage(packet.acknowledgment());
-			if (optional.isPresent()) {
+			Optional<LastSeenMessageList> optional = this.validateAcknowledgment(packet.acknowledgment());			if (optional.isPresent()) {
 				if (!packet.chatMessage().startsWith("/")){
 
 					String changedMessage = packet.chatMessage().replace('&', '§');
@@ -158,7 +159,7 @@ public abstract class MixinChat extends ServerCommonNetworkHandler {
 
 	private static boolean hasIllegalCharacter(String message) {
 		for(int i = 0; i < message.length(); ++i) {
-			if (!SharedConstants.isValidChar(message.charAt(i))) {
+			if (!StringHelper.isValidChar(message.charAt(i))) {
 				return true;
 			}
 		}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index e2068c7..7779036 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -28,8 +28,8 @@
 		}
 	],
 	"depends": {
-		"fabricloader": ">=0.14.21",
-		"minecraft": "~1.20.4",
+		"fabricloader": ">=0.16.9",
+		"minecraft": "~1.21.4",
 		"java": ">=17",
 		"fabric-api": "*"
 	},