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/main/java/com | |
| parent | 4b36470d8dd53a11065ad7bbf8707fecbe20946d (diff) | |
Commence work on pre-release 5 port
Diffstat (limited to 'src/main/java/com')
5 files changed, 15 insertions, 13 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); } } |
