Architectury! (#61)

2 files changed, 38 insertions, 0 deletions

diff --git a/common/src/main/java/dev/isxander/yacl/mixin/AbstractSelectionListMixin.java b/common/src/main/java/dev/isxander/yacl/mixin/AbstractSelectionListMixin.java
new file mode 100644
index 0000000..1b53e96
--- /dev/null
+++ b/common/src/main/java/dev/isxander/yacl/mixin/AbstractSelectionListMixin.java
@@ -0,0 +1,25 @@
+package dev.isxander.yacl.mixin;
+
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.List;
+
+@Mixin(AbstractSelectionList.class)
+public abstract class AbstractSelectionListMixin<E extends AbstractSelectionList.Entry<E>> {
+    @Shadow public abstract List<E> children();
+
+    /**
+     * Mojang use the field access of children to get max index to loop through keyboard navigation to find the next entry.
+     * YACL modifies these children() method to filter out hidden entries, so we need to redirect the field access to the
+     * method, so we don't get ArrayIndexOutOfBoundsException.
+     */
+    @Redirect(method = "nextEntry(Lnet/minecraft/client/gui/navigation/ScreenDirection;Ljava/util/function/Predicate;Lnet/minecraft/client/gui/components/AbstractSelectionList$Entry;)Lnet/minecraft/client/gui/components/AbstractSelectionList$Entry;", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/components/AbstractSelectionList;children:Ljava/util/List;", opcode = Opcodes.GETFIELD))
+    private List<E> modifyChildrenCall(AbstractSelectionList<E> instance) {
+        return children();
+    }
+}
diff --git a/common/src/main/java/dev/isxander/yacl/mixin/OptionInstanceAccessor.java b/common/src/main/java/dev/isxander/yacl/mixin/OptionInstanceAccessor.java
new file mode 100644
index 0000000..4eea9a9
--- /dev/null
+++ b/common/src/main/java/dev/isxander/yacl/mixin/OptionInstanceAccessor.java
@@ -0,0 +1,13 @@
+package dev.isxander.yacl.mixin;
+
+import net.minecraft.client.OptionInstance;
+import org.jetbrains.annotations.ApiStatus;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@ApiStatus.Internal
+@Mixin(OptionInstance.class)
+public interface OptionInstanceAccessor<T> {
+    @Accessor
+    T getInitialValue();
+}