Merge branch 'update/1.19.4' into 1.19.x/dev

# Conflicts:
#	build.gradle.kts

1 files changed, 42 insertions, 0 deletions

diff --git a/src/client/java/dev/isxander/yacl/gui/controllers/LabelController.java b/src/client/java/dev/isxander/yacl/gui/controllers/LabelController.java
index 0017b59..1dfae0b 100644
--- a/src/client/java/dev/isxander/yacl/gui/controllers/LabelController.java
+++ b/src/client/java/dev/isxander/yacl/gui/controllers/LabelController.java
@@ -6,12 +6,18 @@ import dev.isxander.yacl.api.Option;
 import dev.isxander.yacl.api.utils.Dimension;
 import dev.isxander.yacl.gui.AbstractWidget;
 import dev.isxander.yacl.gui.YACLScreen;
+import net.minecraft.client.gui.ComponentPath;
+import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.components.MultiLineLabel;
+import net.minecraft.client.gui.narration.NarratedElementType;
+import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.gui.navigation.FocusNavigationEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.Style;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -50,6 +56,7 @@ public class LabelController implements Controller<Component> {
     public class LabelControllerElement extends AbstractWidget {
         private List<FormattedCharSequence> wrappedText;
         protected MultiLineLabel wrappedTooltip;
+        protected boolean focused;
 
         protected final YACLScreen screen;
 
@@ -70,6 +77,13 @@ public class LabelController implements Controller<Component> {
                 textRenderer.drawShadow(matrices, text, getDimension().x() + getXPadding(), y + getYPadding(), option().available() ? -1 : 0xFFA0A0A0);
                 y += textRenderer.lineHeight;
             }
+
+            if (isFocused()) {
+                GuiComponent.fill(matrices, getDimension().x() - 1, getDimension().y() - 1, getDimension().xLimit() + 1, getDimension().y(), -1);
+                GuiComponent.fill(matrices, getDimension().x() - 1, getDimension().y() - 1, getDimension().x(), getDimension().yLimit() + 1, -1);
+                GuiComponent.fill(matrices, getDimension().x() - 1, getDimension().yLimit(), getDimension().xLimit() + 1, getDimension().yLimit() + 1, -1);
+                GuiComponent.fill(matrices, getDimension().xLimit(), getDimension().y() - 1, getDimension().xLimit() + 1, getDimension().yLimit() + 1, -1);
+            }
         }
 
         @Override
@@ -147,5 +161,33 @@ public class LabelController implements Controller<Component> {
         public boolean matchesSearch(String query) {
             return formatValue().getString().toLowerCase().contains(query.toLowerCase());
         }
+
+        @Nullable
+        @Override
+        public ComponentPath nextFocusPath(FocusNavigationEvent focusNavigationEvent) {
+            if (!option().available())
+                return null;
+            return !this.isFocused() ? ComponentPath.leaf(this) : null;
+        }
+
+        @Override
+        public boolean isFocused() {
+            return focused;
+        }
+
+        @Override
+        public void setFocused(boolean focused) {
+            this.focused = focused;
+        }
+
+        @Override
+        public void updateNarration(NarrationElementOutput builder) {
+            builder.add(NarratedElementType.TITLE, formatValue());
+        }
+
+        @Override
+        public NarrationPriority narrationPriority() {
+            return NarrationPriority.FOCUSED;
+        }
     }
 }