bind menu & button rendering

src/main/java/dev/isxander/controlify/mixins/compat/screen/vanilla/AbstractContainerEventHandlerMixin.java

@@ -0,0 +1,18 @@
+package dev.isxander.controlify.mixins.compat.screen.vanilla;
+
+import dev.isxander.controlify.compatibility.screen.component.CustomFocus;
+import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(AbstractContainerEventHandler.class)
+public abstract class AbstractContainerEventHandlerMixin implements CustomFocus {
+    @Shadow public abstract @Nullable GuiEventListener getFocused();
+
+    @Override
+    public GuiEventListener getCustomFocus() {
+        return getFocused();
+    }
+}

src/main/java/dev/isxander/controlify/mixins/compat/screen/vanilla/AbstractSliderButtonMixin.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.compat.screen.vanilla;
 
 import dev.isxander.controlify.compatibility.screen.component.ComponentProcessor;
 import dev.isxander.controlify.compatibility.screen.component.ComponentProcessorProvider;
@@ -23,7 +23,7 @@ public class AbstractSliderButtonMixin implements ComponentProcessorProvider {
     );
 
     @Override
-    public ComponentProcessor<AbstractSliderButton> componentProcessor() {
+    public ComponentProcessor componentProcessor() {
         return controlify$processor;
     }
 }

src/main/java/dev/isxander/controlify/mixins/compat/screen/vanilla/ContainerObjectSelectionListEntryMixin.java

@@ -0,0 +1,18 @@
+package dev.isxander.controlify.mixins.compat.screen.vanilla;
+
+import dev.isxander.controlify.compatibility.screen.component.CustomFocus;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(ContainerObjectSelectionList.Entry.class)
+public abstract class ContainerObjectSelectionListEntryMixin implements CustomFocus {
+    @Shadow public abstract @Nullable GuiEventListener getFocused();
+
+    @Override
+    public GuiEventListener getCustomFocus() {
+        return getFocused();
+    }
+}

src/main/java/dev/isxander/controlify/mixins/compat/screen/vanilla/ScreenAccessor.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.compat.screen.vanilla;
 
 import net.minecraft.client.gui.ComponentPath;
 import net.minecraft.client.gui.navigation.FocusNavigationEvent;

src/main/java/dev/isxander/controlify/mixins/compat/screen/vanilla/ScreenMixin.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.compat.screen.vanilla;
 
 import dev.isxander.controlify.compatibility.screen.ScreenProcessorProvider;
 import dev.isxander.controlify.compatibility.screen.ScreenProcessor;

src/main/java/dev/isxander/controlify/mixins/core/ClientPacketListenerMixin.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.core;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;

src/main/java/dev/isxander/controlify/mixins/core/KeyboardHandlerMixin.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.core;
 
 import dev.isxander.controlify.Controlify;
 import dev.isxander.controlify.InputMode;

src/main/java/dev/isxander/controlify/mixins/core/MinecraftMixin.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.core;
 
 import dev.isxander.controlify.Controlify;
 import net.minecraft.client.Minecraft;

src/main/java/dev/isxander/controlify/mixins/core/MouseHandlerMixin.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.core;
 
 import dev.isxander.controlify.Controlify;
 import dev.isxander.controlify.InputMode;

src/main/java/dev/isxander/controlify/mixins/feature/bind/KeyMappingAccessor.java

@@ -1,4 +1,4 @@
-package dev.isxander.controlify.mixins;
+package dev.isxander.controlify.mixins.feature.bind;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyMapping;