Fixed mixin. Fixed chat parse issues.

Author: NoMathExpectation

build.gradle.kts

@@ -133,7 +133,7 @@ mixin {
 
 tasks.named<Jar>("jar") {
     manifest.attributes(
-        mapOf("MixinConfigs" to "${mod_id}.refmap.json")
+        mapOf("MixinConfigs" to "${mod_id}.mixins.json")
     )
 }
 
@@ -153,6 +153,7 @@ dependencies {
 
     // mixin
     annotationProcessor("org.spongepowered:mixin:0.8.5:processor")
+    //jarJar(implementation("io.github.llamalad7:mixinextras-neoforge:0.5.0")!!)
 
     // kff
     implementation("thedarkcolour:kotlinforforge:4.10.0")

src/main/java/NoMathExpectation/chatExchange/neoForged/mixin/ServerGamePacketListenerImplMixin.java

@@ -1,48 +1,68 @@
 package NoMathExpectation.chatExchange.neoForged.mixin;
 
 import NoMathExpectation.chatExchange.neoForged.*;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ServerGamePacketListener;
 import net.minecraft.network.protocol.game.ServerboundChatPacket;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
 public abstract class ServerGamePacketListenerImplMixin implements ServerGamePacketListener {
     @Shadow
     public ServerPlayer player;
 
-    @ModifyVariable(
+    @Unique
+    private static final Logger chatExchange$LOGGER = LoggerFactory.getLogger(ChatExchange.ID);
+
+    @Inject(
             method = "handleChat(Lnet/minecraft/network/protocol/game/ServerboundChatPacket;)V",
             at = @At("HEAD"),
-            ordinal = 0,
-            argsOnly = true
+            cancellable = true
     )
-    private ServerboundChatPacket onHandleChat(ServerboundChatPacket packet) {
+    private void onHandleChat(ServerboundChatPacket packet, CallbackInfo ci) {
         if (!ChatExchangeConfig.INSTANCE.getMixinMode().get()) {
-            return packet;
+            return;
         }
 
         var data = ChatExchangeDataKt.getChatExchangeData(player.server);
         var string = packet.message();
         if ((!ChatExchangeConfig.INSTANCE.getChat().get() || data.isIgnoredPlayer(player.getUUID())) && !ChatExchangeConfigKt.startsWithBroadcastPrefix(string)) {
-            return packet;
+            return;
         }
 
+        ci.cancel();
+
         var newString = ChatExchangeConfigKt.removeBroadcastPrefix(string);
+        var playerName = ExchangeServer.Companion.componentToString(player.getName());
         ExchangeServer.Companion.sendEvent(
                 new MessageEvent(
-                        ExchangeServer.Companion.componentToString(player.getName()),
+                        playerName,
                         newString
                 )
         );
 
-        if (!ChatExchangeConfig.INSTANCE.getChat().get() || data.isIgnoredPlayer(player.getUUID())) {
-            newString = ChatExchangeConfig.INSTANCE.getBroadcastPrefix().get() + newString;
+        Component message;
+        try {
+            var formattedPrefix = ChatExchangeConfig.INSTANCE.getCommandBroadcastFormat().get().formatted(playerName);
+            message = NeoForgeEventsKt.parseJsonToComponent(formattedPrefix);
+        } catch (Exception e) {
+            chatExchange$LOGGER.error(
+                    "Unable to resolve component from command broadcast format. Using default.",
+                    e
+            );
+            message = Component.literal("<%s> ".formatted(playerName));
         }
-        return new ServerboundChatPacket(newString, packet.timeStamp(), packet.salt(), packet.signature(), packet.lastSeenMessages());
+        message = message.copy().append(newString);
+
+        player.server.getPlayerList().broadcastSystemMessage(message, false);
     }
 }

src/main/kotlin/NoMathExpectation/chatExchange/neoForged/ChatExchangeConfig.kt

@@ -83,22 +83,26 @@ object ChatExchangeConfig {
                 { true }
             )
     val broadcastPrefix: ForgeConfigSpec.ConfigValue<String> =
-        builder.comment("The prefix to prepend when displaying manually broadcast chat message.")
+        builder.comment("The prefix to prepend when player message is broadcast through player chat.")
             .translation("modid.config.broadcastPrefix")
             .define("broadcastPrefix", "")
     val commandBroadcastFormat: ForgeConfigSpec.ConfigValue<String> = builder.comment(
-        "The message format when player broadcast message using the command.",
+        "The message prefix format when player message is broadcast through system chat.",
         "Will not prepend broadcast prefix."
     )
         .translation("modid.config.commandBroadcastFormat")
-        .define("commandBroadcastFormat", "\"<%s> %s\"") {
-            (it as? String)?.parseJsonToComponent() != null
+        .define("commandBroadcastFormat", "\"<%s> \"") {
+            runCatching {
+                (it as? String)?.parseJsonToComponent()
+            }.getOrNull() != null
         }
     val receiveMessageFormat: ForgeConfigSpec.ConfigValue<String> =
         builder.comment("The message format when receiving message from outside.")
             .translation("modid.config.receiveMessageFormat")
-            .define("receiveMessageFormat", "\"<%s> %s\"") {
-                (it as? String)?.parseJsonToComponent() != null
+            .define("receiveMessageFormat", "\"<%s> \"") {
+                runCatching {
+                    (it as? String)?.parseJsonToComponent()
+                }.getOrNull() != null
             }
 
     val spec: ForgeConfigSpec = builder.build()

src/main/kotlin/NoMathExpectation/chatExchange/neoForged/ExchangeServer.kt

@@ -103,8 +103,10 @@ class ExchangeServer(
                 val formatted = kotlin.runCatching {
                     ChatExchangeConfig.receiveMessageFormat
                         .get()
-                        .format(event.from, event.content)
+                        .format(event.from)
                         .parseJsonToComponent()
+                        .copy()
+                        .append(event.content)
                 }.getOrElse {
                     logger.warn("Failed to format message from receive message format. Using default.", it)
                     Component.literal("<${event.from}> ${event.content}")

src/main/kotlin/NoMathExpectation/chatExchange/neoForged/NeoForgeEvents.kt

@@ -2,7 +2,6 @@ package NoMathExpectation.chatExchange.neoForged
 
 import com.mojang.brigadier.arguments.BoolArgumentType
 import com.mojang.brigadier.arguments.StringArgumentType
-import net.minecraft.ChatFormatting
 import net.minecraft.commands.Commands
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.contents.LiteralContents
@@ -159,13 +158,12 @@ object NeoForgeEvents {
                         val name = ExchangeServer.componentToString(context.source.displayName)
 
                         val component = kotlin.runCatching {
-                            val formatted = ChatExchangeConfig.commandBroadcastFormat
+                            ChatExchangeConfig.commandBroadcastFormat
                                 .get()
-                                .format(
-                                    name,
-                                    message,
-                                )
-                            formatted.parseJsonToComponent()
+                                .format(name)
+                                .parseJsonToComponent()
+                                .copy()
+                                .append(message)
                         }.getOrElse {
                             logger.error(
                                 "Unable to resolve component from command broadcast format. Using default.",
@@ -179,9 +177,7 @@ object NeoForgeEvents {
                         ExchangeServer.sendEvent(
                             MessageEvent(name, message)
                         )
-                        context.source.server.playerList.players.forEach {
-                            it.sendSystemMessage(component)
-                        }
+                        context.source.server.playerList.broadcastSystemMessage(component, false)
 
                         1
                     }
@@ -254,5 +250,5 @@ object NeoForgeEvents {
 
 fun String.parseJsonToComponent(): Component {
     return Component.Serializer.fromJson(this)
-        ?: Component.literal("[error]").withStyle(ChatFormatting.RED)
+        ?: error("Unable to parse json to component: $this")
 }