diff options
| author | Aizistral | 2022-07-18 13:38:59 +0200 |
|---|---|---|
| committer | Aizistral | 2022-07-18 13:38:59 +0200 |
| commit | e4b69183fbff5eac4b595751d99529a704e0233c (patch) | |
| tree | da7fe9e626b070e685161bfa942468848b28a41b /src/test | |
| parent | 4b36470d8dd53a11065ad7bbf8707fecbe20946d (diff) | |
Commence work on pre-release 5 port
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java | 1 | ||||
| -rw-r--r-- | src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java | 32 |
2 files changed, 26 insertions, 7 deletions
diff --git a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java index 0521d08..5b77aad 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java +++ b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java @@ -22,7 +22,6 @@ import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.gui.screens.reporting.ChatReportScreen; -import net.minecraft.client.multiplayer.chat.LoggedChat; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket; import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket.Action; diff --git a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java index fd9774a..96edcc4 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java +++ b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java @@ -8,8 +8,15 @@ import javax.annotation.Nullable; import com.mojang.authlib.GameProfile; +import net.minecraft.network.chat.ChatMessageContent; import net.minecraft.network.chat.ChatSender; +import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.LastSeenMessages; +import net.minecraft.network.chat.MessageSignature; +import net.minecraft.network.chat.PlayerChatMessage; +import net.minecraft.network.chat.SignedMessageBody; +import net.minecraft.network.chat.SignedMessageHeader; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket; import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket.Action; @@ -40,21 +47,34 @@ public class UnrealPlayer { public void join(MinecraftServer server, ServerGamePacketListenerImpl connection) { ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.ADD_PLAYER, - new ServerPlayer(server, server.overworld(), new GameProfile(this.id, this.name), null)); + this.getPlayer(server)); connection.send(packet); } public void leave(MinecraftServer server, ServerGamePacketListenerImpl connection) { ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.REMOVE_PLAYER, - new ServerPlayer(server, server.overworld(), new GameProfile(this.id, this.name), null)); + this.getPlayer(server)); connection.send(packet); } + public ServerPlayer getPlayer(MinecraftServer server) { + return new ServerPlayer(server, server.overworld(), new GameProfile(this.id, this.name), null); + } + public void sendMessage(MinecraftServer server, ServerGamePacketListenerImpl connection, String message, @Nullable String unsigned) { - ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(Component.literal(message), - unsigned != null ? Optional.of(Component.literal(unsigned)) : Optional.empty(), 0, - new ChatSender(this.id, Component.literal(this.name)), Instant.now(), - Crypt.SaltSignaturePair.EMPTY); + ServerPlayer player = this.getPlayer(server); + ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(new PlayerChatMessage( + new SignedMessageHeader(MessageSignature.EMPTY, this.id), MessageSignature.EMPTY, + new SignedMessageBody(new ChatMessageContent(Component.literal(message)), Instant.now(), 0, + LastSeenMessages.EMPTY), unsigned != null ? Optional.of(Component.literal(unsigned)) + : Optional.empty()), + ChatType.bind(ChatType.CHAT, player).toNetwork(server.registryAccess())); + + + // new ClientboundPlayerChatPacket(Component.literal(message), + // unsigned != null ? Optional.of(Component.literal(unsigned)) : Optional.empty(), 0, + // new ChatSender(this.id, Component.literal(this.name)), Instant.now(), + // Crypt.SaltSignaturePair.EMPTY); connection.send(packet); } |
