diff --git a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java
index e7dccb25..74f73d79 100644
--- a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java
+++ b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java
@@ -45,13 +45,13 @@ public abstract class MixinServerGamePacketListenerImpl {
     @Shadow
     public abstract void disconnect(Component component);
     
-    @Inject(method = "handleChat", at = @At(value = "INVOKE",
-                                            target = "Lnet/minecraft/server/players/PlayerList;broadcastMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/ChatType;Ljava/util/UUID;)V"),
+    @Inject(method = "handleChat(Ljava/lang/String;)V",
+            at = @At(value = "INVOKE",
+                     target = "Lnet/minecraft/server/players/PlayerList;broadcastMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/ChatType;Ljava/util/UUID;)V"),
             cancellable = true)
-    private void handleChat(ServerboundChatPacket packet, CallbackInfo ci) {
-        String string = StringUtils.normalizeSpace(packet.getMessage());
-        Component component = new TranslatableComponent("chat.type.text", this.player.getDisplayName(), string);
-        InteractionResultHolder<Component> process = ChatEvent.SERVER.invoker().process(this.player, string, component);
+    private void handleChat(String message, CallbackInfo ci) {
+        Component component = new TranslatableComponent("chat.type.text", this.player.getDisplayName(), message);
+        InteractionResultHolder<Component> process = ChatEvent.SERVER.invoker().process(this.player, message, component);
         if (process.getResult() == InteractionResult.FAIL)
             ci.cancel();
         else if (process.getObject() != null && !process.getObject().equals(component)) {
diff --git a/gradle.properties b/gradle.properties
index ae6b5e40..45d4696c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,15 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.16.3
+minecraft_version=1.16.4
 
 archives_base_name=architectury
 mod_version=1.0
 last_minor_build=3
 maven_group=me.shedaniel
 
-fabric_loader_version=0.10.5+build.213
-fabric_api_version=0.24.3+build.414-1.16
+fabric_loader_version=0.10.6+build.214
+fabric_api_version=0.25.1+build.416-1.16
 mod_menu_version=1.14.6+
 
-forge_version=34.1.34
\ No newline at end of file
+forge_version=35.0.15
\ No newline at end of file