From 13c7ba45ff201423eb8dba8a40cfb66ebb531439 Mon Sep 17 00:00:00 2001
From: Xander <xander@isxander.dev>
Date: Tue, 25 Apr 2023 16:28:41 +0100
Subject: Architectury! (#61)

---
 .../mixin/client/AbstractSelectionListMixin.java   | 26 ----------------------
 .../yacl/mixin/client/OptionInstanceAccessor.java  | 13 -----------
 2 files changed, 39 deletions(-)
 delete mode 100644 src/client/java/dev/isxander/yacl/mixin/client/AbstractSelectionListMixin.java
 delete mode 100644 src/client/java/dev/isxander/yacl/mixin/client/OptionInstanceAccessor.java

(limited to 'src/client/java/dev/isxander/yacl/mixin')

diff --git a/src/client/java/dev/isxander/yacl/mixin/client/AbstractSelectionListMixin.java b/src/client/java/dev/isxander/yacl/mixin/client/AbstractSelectionListMixin.java
deleted file mode 100644
index 978fd16..0000000
--- a/src/client/java/dev/isxander/yacl/mixin/client/AbstractSelectionListMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package dev.isxander.yacl.mixin.client;
-
-import net.minecraft.client.Minecraft;
-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/src/client/java/dev/isxander/yacl/mixin/client/OptionInstanceAccessor.java b/src/client/java/dev/isxander/yacl/mixin/client/OptionInstanceAccessor.java
deleted file mode 100644
index b8df39f..0000000
--- a/src/client/java/dev/isxander/yacl/mixin/client/OptionInstanceAccessor.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package dev.isxander.yacl.mixin.client;
-
-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();
-}
-- 
cgit