From c306300e68fd67d365c652d42ffa55aaf0a695e7 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Thu, 23 Feb 2023 15:23:17 +0100 Subject: Fix MixinRowHelper --- .../nochatreports/common/mixins/client/MixinRowHelper.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRowHelper.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRowHelper.java index 8a9bcab..4165ccf 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRowHelper.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRowHelper.java @@ -8,19 +8,22 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.layouts.GridLayout; +import net.minecraft.client.gui.layouts.LayoutElement; import net.minecraft.client.gui.screens.OptionsScreen; @Mixin(GridLayout.RowHelper.class) public abstract class MixinRowHelper { - @Inject(method = "addChild(Lnet/minecraft/client/gui/components/AbstractWidget;)" + @Inject(method = "addChild(Lnet/minecraft/client/gui/layouts/LayoutElement;)" + "Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("HEAD"), cancellable = true) - private void onAddChild(AbstractWidget widget, CallbackInfoReturnable info) { + private void onAddChild(LayoutElement element, CallbackInfoReturnable info) { if (NCRConfig.getClient().disableTelemetry() && NCRConfig.getClient().removeTelemetryButton()) - if (OptionsScreen.TELEMETRY.equals(widget.getMessage())) { - info.setReturnValue(widget); - } + if (element instanceof Button button) + if (OptionsScreen.TELEMETRY.equals(button.getMessage())) { + info.setReturnValue(button); + } } } -- cgit v1.2.3