From 22d70398048e76c4bfa072b81b7c04fe3dcd04a3 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Thu, 23 Feb 2023 14:58:37 +0100 Subject: Minor porting adjustments --- .../nochatreports/common/mixins/client/MixinChatListener.java | 2 +- .../nochatreports/common/mixins/client/MixinServerStatusPinger$1.java | 2 +- .../nochatreports/common/mixins/common/MixinServerStatus.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index f0a6d8c..88d9809 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -42,7 +42,7 @@ public class MixinChatListener { private void onHandleSystemMessage(Component message, boolean overlay, CallbackInfo info) { if (message instanceof MutableComponent mutable && message.getContents() instanceof TranslatableContents translatable) { if (translatable.getKey().equals("chat.disabled.missingProfileKey")) { - mutable.contents = new TranslatableContents("chat.nochatreports.disabled.signing_requested"); + mutable.contents = new TranslatableContents("chat.nochatreports.disabled.signing_requested", null, TranslatableContents.NO_ARGS); if (!ServerSafetyState.isOnRealms()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java index b74f175..4ab2b47 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java @@ -29,7 +29,7 @@ public abstract class MixinServerStatusPinger$1 implements ServerPingerExtension @Inject(method = "handleStatusResponse(Lnet/minecraft/network/protocol/status/ClientboundStatusResponsePacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;getPlayers()Lnet/minecraft/network/protocol/status/ServerStatus$Players;", ordinal = 0, shift = At.Shift.BEFORE)) private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) { - boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports(); + boolean preventsReports = ((ServerDataExtension) (Object) packet.status()).preventsChatReports(); ((ServerDataExtension) this.getServerData()).setPreventsChatReports(preventsReports); if (NCRConfig.getCommon().enableDebugLog()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java index 41563a5..6324e22 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java @@ -38,8 +38,8 @@ public class MixinServerStatus implements ServerDataExtension { public boolean preventsChatReports() { var self = (ServerStatus) (Object) this; - if (self.getVersion() != null && self.getVersion().getProtocol() < 759 - && self.getVersion().getProtocol() > 0) + if (self.version().isPresent() && self.version().get().protocol() < 759 + && self.version().get().protocol() > 0) return true; return this.preventsChatReports; -- cgit v1.2.3