1.20.2

1 files changed, 35 insertions, 0 deletions

diff --git a/fabric/src/main/java/dev/isxander/yacl3/fabric/mixin/ContainerEventHandlerMixin.java b/fabric/src/main/java/dev/isxander/yacl3/fabric/mixin/ContainerEventHandlerMixin.java
new file mode 100644
index 0000000..7e1be75
--- /dev/null
+++ b/fabric/src/main/java/dev/isxander/yacl3/fabric/mixin/ContainerEventHandlerMixin.java
@@ -0,0 +1,35 @@
+package dev.isxander.yacl3.fabric.mixin;
+
+import net.minecraft.client.gui.components.events.ContainerEventHandler;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.components.tabs.TabNavigationBar;
+import net.minecraft.client.gui.navigation.FocusNavigationEvent;
+import net.minecraft.client.gui.navigation.ScreenAxis;
+import net.minecraft.client.gui.navigation.ScreenDirection;
+import net.minecraft.client.gui.navigation.ScreenRectangle;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.List;
+
+/**
+ * This is in Fabric-only because only the Fabric fork of mixin supports @Redirect on interfaces.
+ * This will change in the next release of Mixin.
+ */
+@Mixin(ContainerEventHandler.class)
+public interface ContainerEventHandlerMixin {
+    /**
+     * This mixin is used to prevent the tab bar from being focused when navigating left or right
+     * through the YACL options screen. This can also apply to vanilla as navigating left or right
+     * should never result in focusing the always-at-the-top tab bar.
+     * Without this, navigating right from the option list focuses the tab bar, not the action buttons/description.
+     */
+    @Redirect(method = {"nextFocusPathVaguelyInDirection", "nextFocusPathInDirection"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/events/ContainerEventHandler;children()Ljava/util/List;"))
+    default List<?> modifyFocusCandidates(ContainerEventHandler instance, ScreenRectangle screenArea, ScreenDirection direction, @Nullable GuiEventListener focused, FocusNavigationEvent event) {
+        if (direction.getAxis() == ScreenAxis.HORIZONTAL)
+            return instance.children().stream().filter(child -> !(child instanceof TabNavigationBar)).toList();
+        return instance.children();
+    }
+}