From 1eb0edb74d7f4d31b2ed9879d03aeb49fa12f66f Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 12 Dec 2022 16:38:52 +0100 Subject: Remove telemetry button when appropriate Closes #322 --- .../nochatreports/NoChatReportsClient.java | 1 + .../nochatreports/config/NCRConfigClient.java | 7 ++++- .../mixins/client/MixinRowHelper.java | 30 ++++++++++++++++++++++ src/main/resources/nochatreports.accesswidener | 3 ++- src/main/resources/nochatreports.mixins.json | 3 ++- 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java (limited to 'src') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 4d9f194..4cd2f8e 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -14,6 +14,7 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.telemetry.TelemetryInfoScreen; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ProfileKeyPairManager; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java index e79bc5a..6054f7e 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java @@ -13,7 +13,8 @@ public final class NCRConfigClient extends JSONConfig { verifiedIconEnabled = true, showServerSafety = true, hideInsecureMessageIndicators = true, hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true, hideWarningToast = true, hideSigningRequestMessage = false, alwaysHideReportButton = false, - skipRealmsWarning = false, disableTelemetry = true, demandOnServer = false; + skipRealmsWarning = false, disableTelemetry = true, removeTelemetryButton = true, + demandOnServer = false; protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0; protected NCRConfigClient() { @@ -199,4 +200,8 @@ public final class NCRConfigClient extends JSONConfig { return this.defaultSigningMode; } + public boolean removeTelemetryButton() { + return this.removeTelemetryButton; + } + } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java new file mode 100644 index 0000000..1c1958b --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java @@ -0,0 +1,30 @@ +package com.aizistral.nochatreports.mixins.client; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.config.NCRConfig; + +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.GridWidget; +import net.minecraft.client.gui.screens.OptionsScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; + +@Mixin(GridWidget.RowHelper.class) +public abstract class MixinRowHelper { + + @Inject(method = "addChild(Lnet/minecraft/client/gui/components/AbstractWidget;)" + + "Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("HEAD"), cancellable = true) + private void onAddChild(AbstractWidget widget, CallbackInfoReturnable info) { + if (NCRConfig.getClient().disableTelemetry() && NCRConfig.getClient().removeTelemetryButton()) + if (OptionsScreen.TELEMETRY.equals(widget.getMessage())) { + info.setReturnValue(widget); + } + } + +} diff --git a/src/main/resources/nochatreports.accesswidener b/src/main/resources/nochatreports.accesswidener index 4819215..ccf4f65 100644 --- a/src/main/resources/nochatreports.accesswidener +++ b/src/main/resources/nochatreports.accesswidener @@ -24,4 +24,5 @@ accessible field net/minecraft/client/gui/screens/Screen font Lnet/minecraft/cli accessible field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/Tooltip; accessible field net/minecraft/client/gui/components/AbstractWidget tooltipMsDelay I accessible method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V -extendable method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V \ No newline at end of file +extendable method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V +accessible field net/minecraft/client/gui/screens/OptionsScreen TELEMETRY Lnet/minecraft/network/chat/Component; \ No newline at end of file diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index ed7271c..82bf72c 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -31,7 +31,8 @@ "client.MixinGuiMessageTagIcon", "client.MixinTitleScreen", "client.MixinMinecraft", - "client.MixinClientPacketListener" + "client.MixinClientPacketListener", + "client.MixinRowHelper" ], "server": [ "server.MixinDedicatedServer" -- cgit v1.2.3