summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java8
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java2
-rw-r--r--src/main/resources/fabric.mod.json2
-rw-r--r--src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java1
-rw-r--r--src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java32
8 files changed, 42 insertions, 21 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index f8492e5..5e04502 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -14,8 +14,8 @@ import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.DetectedVersion;
import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.client.multiplayer.chat.LoggedChat;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.login.ServerboundHelloPacket;
import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
index 2dc5f6c..49e1db8 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
@@ -29,7 +29,7 @@ public class MixinChatListener {
*/
@Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true)
- private void onEvaluateTrustLevel(ChatSender chatSender, PlayerChatMessage playerChatMessage,
+ private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage,
Component component, PlayerInfo playerInfo, CallbackInfoReturnable<ChatTrustLevel> info) {
if (NoReportsConfig.suppressMessageTrustIndicators()) {
info.setReturnValue(ChatTrustLevel.SECURE);
@@ -38,9 +38,9 @@ public class MixinChatListener {
// Debug never dies
if (NoReportsConfig.isDebugLogEnabled()) {
NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}",
- Component.Serializer.toStableJson(playerChatMessage.signedContent()),
- chatSender.name().getString(),
- Base64.getEncoder().encodeToString(playerChatMessage.signature().saltSignature().signature()));
+ Component.Serializer.toStableJson(playerChatMessage.signedContent().plain()),
+ playerChatMessage.signer().profileId(),
+ Base64.getEncoder().encodeToString(playerChatMessage.headerSignature().bytes()));
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
index 516b987..57ce4bb 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
@@ -8,7 +8,9 @@ import net.minecraft.Util;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.commands.SharedSuggestionProvider;
import net.minecraft.commands.arguments.ArgumentSignatures;
+import net.minecraft.network.chat.ChatMessageContent;
import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.LastSeenMessages;
import net.minecraft.network.chat.MessageSignature;
import net.minecraft.network.chat.MessageSigner;
import net.minecraft.util.Crypt;
@@ -33,9 +35,9 @@ public class MixinLocalPlayer {
*/
@Inject(method = "signMessage", at = @At("HEAD"), cancellable = true)
- private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable<MessageSignature> info) {
+ private void onSignMessage(MessageSigner signer, ChatMessageContent message, LastSeenMessages messages, CallbackInfoReturnable<MessageSignature> info) {
if (!ServerSafetyState.forceSignedMessages()) {
- info.setReturnValue(MessageSignature.unsigned(signer.sender()));
+ info.setReturnValue(MessageSignature.EMPTY);
}
}
@@ -45,9 +47,9 @@ public class MixinLocalPlayer {
*/
@Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true)
- private void onSignCommand(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, CallbackInfoReturnable<ArgumentSignatures> info) {
+ private void onSignCommand(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, LastSeenMessages messages, CallbackInfoReturnable<ArgumentSignatures> info) {
if (!ServerSafetyState.forceSignedMessages()) {
- info.setReturnValue(ArgumentSignatures.empty());
+ info.setReturnValue(ArgumentSignatures.EMPTY);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
index 8373fe6..aea5ecc 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
@@ -34,9 +34,9 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC
private void onSend(Packet<?> packet, CallbackInfo info) {
if (NoReportsConfig.convertToGameMessage()) {
if (packet instanceof ClientboundPlayerChatPacket chat) {
- Component component = chat.unsignedContent().orElse(chat.signedContent());
- ChatTypeDecoration decoration = this.player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY).byId(chat.typeId()).chat();
- component = decoration.decorate(component, chat.sender());
+ Component component = chat.message().signedContent().plain();
+ ChatTypeDecoration decoration = this.player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY).byId(chat.chatType().chatType()).chat();
+ component = decoration.decorate(component, chat.chatType().resolve(this.player.level.registryAccess()));
packet = new ClientboundSystemChatPacket(component, false);
info.cancel();
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
index fb7fb0a..dc903da 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
@@ -26,7 +26,7 @@ public class MixinServerboundChatPacket {
@Inject(method = "getSignature", at = @At("RETURN"), cancellable = true)
private void onGetSignature(UUID id, CallbackInfoReturnable<MessageSignature> info) {
- info.setReturnValue(new MessageSignature(Util.NIL_UUID, info.getReturnValue().timeStamp(), SaltSignaturePair.EMPTY));
+ info.setReturnValue(MessageSignature.EMPTY);
}
}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index e7212a5..f61bd4f 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -32,7 +32,7 @@
"depends": {
"fabricloader": ">=0.14.6",
"fabric": "*",
- "minecraft": "=1.19.1-beta.3",
+ "minecraft": "=1.19.1-beta.5",
"java": ">=17"
},
"suggests": {},
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);
}