diff options
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
5 files changed, 14 insertions, 23 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java index dd4c2a5..dc1b1bb 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java @@ -1,9 +1,10 @@ package com.aizistral.nochatreports.common.gui; +import java.net.URI; + import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.layouts.Layout; import net.minecraft.client.gui.layouts.LinearLayout; @@ -12,7 +13,6 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.multiplayer.WarningScreen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.util.Util; public class RealmsWarningScreen extends WarningScreen { private static final Component TITLE = Component.translatable("gui.nochatreports.realms_warning.header").withStyle(ChatFormatting.BOLD); @@ -20,7 +20,7 @@ public class RealmsWarningScreen extends WarningScreen { private static final Component CHECK = Component.translatable("gui.nochatreports.realms_warning.check"); private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT); private static final Component LEARN = Component.translatable("gui.nochatreports.realms_warning.learn_more"); - private static final String WIKI_LINK = "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/The-Realms-Question"; + private static final URI WIKI_LINK = URI.create("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/The-Realms-Question"); private static boolean sessionSeen = false; private final Screen previous; private final Screen realms; @@ -52,15 +52,7 @@ public class RealmsWarningScreen extends WarningScreen { protected Layout addFooterButtons() { LinearLayout linearLayout = LinearLayout.horizontal().spacing(8); linearLayout.addChild(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed).build()); - linearLayout.addChild(Button.builder(LEARN, button -> { - Minecraft.getInstance().gui.setScreen(new ConfirmLinkScreen(agree -> { - if (agree) { - Util.getPlatform().openUri(WIKI_LINK); - } - - Minecraft.getInstance().gui.setScreen(this); - }, WIKI_LINK, true)); - }).build()); + linearLayout.addChild(Button.builder(LEARN, ConfirmLinkScreen.confirmLink(this, WIKI_LINK, true)).build()); linearLayout.addChild(Button.builder(CommonComponents.GUI_BACK, this::onBack).build()); return linearLayout; } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java index 1c9ffd8..99a6bf7 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java @@ -9,9 +9,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.common.config.NCRConfig; import com.mojang.authlib.minecraft.TelemetrySession; -import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; +import com.mojang.authlib.services.MinecraftServicesUserApiService; -@Mixin(value = YggdrasilUserApiService.class, remap = false) +@Mixin(value = MinecraftServicesUserApiService.class, remap = false) public class MixinYggdrasilUserApiService { /** diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java index 9dc2e28..32a0335 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java @@ -20,7 +20,7 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.Utf8String; import net.minecraft.network.codec.ByteBufCodecs; -@Mixin(targets = "net.minecraft.network.codec.ByteBufCodecs$34") +@Mixin(targets = "net.minecraft.network.codec.ByteBufCodecs$37") public class MixinJsonByteBufCodec { @Shadow @Final private static Gson GSON; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java index 5e6e205..f50a213 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java @@ -33,15 +33,13 @@ public abstract class MixinServerCommonPacketListenerImpl { if (self instanceof ServerGamePacketListenerImpl listener) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() - : chat.body().content()); + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent().map(Component::getString).orElse(chat.body().content())); } if (NCRConfig.getCommon().convertToGameMessage()) { if (packet instanceof ClientboundPlayerChatPacket chat) { packet = new ClientboundSystemChatPacket(chat.chatType().decorate( - chat.unsignedContent() != null ? chat.unsignedContent() - : Component.literal(chat.body().content()) + chat.unsignedContent().orElseGet(() -> Component.literal(chat.body().content())) ), false); info.cancel(); @@ -63,8 +61,7 @@ public abstract class MixinServerCommonPacketListenerImpl { if (self instanceof ServerGamePacketListenerImpl listener) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() - : chat.body().content()); + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent().map(Component::getString).orElse(chat.body().content())); } if (NCRConfig.getCommon().convertToGameMessage()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java index bf25d92..1ebfb44 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.common.mixins.server; +import java.util.Optional; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -19,8 +21,8 @@ public class MixinServerboundChatPacket { */ @Inject(method = "signature", at = @At("RETURN"), cancellable = true) - private void onGetSignature(CallbackInfoReturnable<MessageSignature> info) { - info.setReturnValue(null); + private void onGetSignature(CallbackInfoReturnable<Optional<MessageSignature>> info) { + info.setReturnValue(Optional.empty()); } } |
