From c073a8f1bfaf235362a6c478f9ccef18a1ebb6d3 Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Mon, 21 Nov 2022 11:26:33 -0800 Subject: [PATCH] Fix unfocused clickgui issue (#417) --- .../lambda/mixin/accessor/gui/AccessorGuiScreen.java | 12 ++++++++++++ .../com/lambda/client/gui/AbstractLambdaGui.kt | 2 ++ src/main/resources/mixins.lambda.json | 1 + 3 files changed, 15 insertions(+) create mode 100644 src/main/java/com/lambda/mixin/accessor/gui/AccessorGuiScreen.java diff --git a/src/main/java/com/lambda/mixin/accessor/gui/AccessorGuiScreen.java b/src/main/java/com/lambda/mixin/accessor/gui/AccessorGuiScreen.java new file mode 100644 index 000000000..9e7a1beda --- /dev/null +++ b/src/main/java/com/lambda/mixin/accessor/gui/AccessorGuiScreen.java @@ -0,0 +1,12 @@ +package com.lambda.mixin.accessor.gui; + +import net.minecraft.client.gui.GuiScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(value = GuiScreen.class) +public interface AccessorGuiScreen { + + @Accessor("eventButton") + void setEventButton(final int eventButton); +} diff --git a/src/main/kotlin/com/lambda/client/gui/AbstractLambdaGui.kt b/src/main/kotlin/com/lambda/client/gui/AbstractLambdaGui.kt index 4f56b2eaf..70333af61 100644 --- a/src/main/kotlin/com/lambda/client/gui/AbstractLambdaGui.kt +++ b/src/main/kotlin/com/lambda/client/gui/AbstractLambdaGui.kt @@ -15,6 +15,7 @@ import com.lambda.client.util.graphics.font.FontRenderAdapter import com.lambda.client.util.math.Vec2d import com.lambda.client.util.math.Vec2f import com.lambda.client.util.threads.safeListener +import com.lambda.mixin.accessor.gui.AccessorGuiScreen import net.minecraft.client.gui.GuiScreen import net.minecraft.client.gui.ScaledResolution import net.minecraft.client.renderer.GlStateManager @@ -140,6 +141,7 @@ abstract class AbstractLambdaGui, E : Any> : GuiScreen() { open fun onDisplayed() { lastClickedWindow = null lastEventButton = -1 + (this as AccessorGuiScreen).setEventButton(-1) displayed.value = true diff --git a/src/main/resources/mixins.lambda.json b/src/main/resources/mixins.lambda.json index 3d065cea2..08b385b45 100644 --- a/src/main/resources/mixins.lambda.json +++ b/src/main/resources/mixins.lambda.json @@ -18,6 +18,7 @@ "accessor.gui.AccessorGuiChat", "accessor.gui.AccessorGuiDisconnected", "accessor.gui.AccessorGuiEditSign", + "accessor.gui.AccessorGuiScreen", "accessor.network.AccessorCPacketChatMessage", "accessor.network.AccessorCPacketCloseWindow", "accessor.network.AccessorCPacketPlayer",