From cbc9d0a284304af0ddfe8ec52ae6cb2f259593f3 Mon Sep 17 00:00:00 2001 From: isXander Date: Wed, 26 Jul 2023 11:33:05 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20mixin=20remapping=20issue?= =?UTF-8?q?=20in=20dev=20envs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mixins/feature/guide/screen/AbstractButtonMixin.java | 3 ++- .../mixins/feature/guide/screen/AbstractWidgetMixin.java | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractButtonMixin.java b/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractButtonMixin.java index 5b7cdd9..1040575 100644 --- a/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractButtonMixin.java +++ b/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractButtonMixin.java @@ -9,6 +9,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractButton; +import net.minecraft.client.gui.narration.NarratableEntry; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -16,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(AbstractButton.class) -public abstract class AbstractButtonMixin extends AbstractWidgetMixin implements ButtonGuideRenderer { +public abstract class AbstractButtonMixin extends AbstractWidgetMixin implements ButtonGuideRenderer, NarratableEntry /* isActive() in AbstractWidgetMixin shadow breaks dev env remapping. must re-implement interface */ { @Unique private RenderData renderData = null; @Inject(method = "renderString", at = @At("RETURN")) diff --git a/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractWidgetMixin.java b/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractWidgetMixin.java index 25a6b0a..aaf82ef 100644 --- a/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractWidgetMixin.java +++ b/src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractWidgetMixin.java @@ -19,8 +19,6 @@ public abstract class AbstractWidgetMixin { @Shadow public abstract int getWidth(); - @Shadow public abstract boolean isActive(); - @ModifyArg(method = "renderScrollingString(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Font;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/AbstractWidget;renderScrollingString(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Font;Lnet/minecraft/network/chat/Component;IIIII)V"), index = 3) protected int shiftDrawSize(int x) { return x;