update 26.1 compat: sodium rewrite + dynamic registry guard + enable deps

- Enable deps.sodium and deps.iris in 26.1-fabric gradle.properties
- Guard radial menu editing behind level != null to prevent ItemStack
  construction before dynamic registries are loaded
- Rewrite Sodium compat for new VideoSettingsScreen API (replaces
  SodiumOptionsGUI): new mixin targets VideoSettingsScreen, tracks
  current page via onSectionFocused injection, implements page
  navigation using ConfigManager.CONFIG, injects into init() for
  initial focus and processor notification
- Update SliderControlElementMixin: target renamed $Button ->
  $SliderControlElement, use IntegerOption.getSteppedValidator() and
  modifyValue() instead of removed interval/min/max fields
- Update CycleControlElementMixin and TickBoxControlElementMixin:
  cycleControl/toggleControl are now private, use @shadow private
- Update FlatButtonWidgetMixin: render -> extractRenderState, remove
  setLabel injection (field is now final, method removed)

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

Author: isXander

src/main/java/dev/isxander/controlify/compatibility/iris/mixins/BaseOptionElementWidgetMixin.java

@@ -1,5 +1,5 @@
 //? if iris {
-/*package dev.isxander.controlify.compatibility.iris.mixins;
+package dev.isxander.controlify.compatibility.iris.mixins;
 
 import dev.isxander.controlify.compatibility.iris.screenop.BaseOptionElementComponentProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessor;
@@ -33,4 +33,4 @@ private void cycle(boolean reverse) {
     }
 
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/iris/screenop/BaseOptionElementComponentProcessor.java

@@ -1,5 +1,5 @@
 //? if iris {
-/*package dev.isxander.controlify.compatibility.iris.screenop;
+package dev.isxander.controlify.compatibility.iris.screenop;
 
 import dev.isxander.controlify.screenop.compat.AbstractSliderComponentProcessor;
 
@@ -17,4 +17,4 @@ protected void incrementSlider(boolean reverse) {
         this.cycleMethod.accept(reverse);
     }
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/AbstractWidgetMixin.java

@@ -1,5 +1,5 @@
 /*? if sodium {*/
-/*package dev.isxander.controlify.compatibility.sodium.mixins;
+package dev.isxander.controlify.compatibility.sodium.mixins;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import dev.isxander.controlify.Controlify;
@@ -19,4 +19,4 @@ private InputType forceSetFocusedOnController(InputType type) {
         return type;
     }
 }
-*//*?}*/
+/*?}*/

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/CycleControlElementMixin.java

@@ -1,5 +1,5 @@
 //? if sodium {
-/*package dev.isxander.controlify.compatibility.sodium.mixins;
+package dev.isxander.controlify.compatibility.sodium.mixins;
 
 import dev.isxander.controlify.compatibility.sodium.screenop.CycleControlProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessor;
@@ -10,7 +10,7 @@
 
 @Mixin(targets = "net.caffeinemc.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement")
 public abstract class CycleControlElementMixin implements ComponentProcessorProvider {
-    @Shadow public abstract void cycleControl(boolean reverse);
+    @Shadow protected abstract void cycleControl(boolean reverse);
 
     @Unique private final ComponentProcessor controlify$componentProcessor
             = new CycleControlProcessor(this::cycleControl);
@@ -20,4 +20,4 @@ public ComponentProcessor componentProcessor() {
         return controlify$componentProcessor;
     }
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/FlatButtonWidgetAccessor.java

@@ -1,5 +1,5 @@
 //? if sodium {
-/*package dev.isxander.controlify.compatibility.sodium.mixins;
+package dev.isxander.controlify.compatibility.sodium.mixins;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -11,4 +11,4 @@ public interface FlatButtonWidgetAccessor {
     @Invoker
     void invokeDoAction();
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/FlatButtonWidgetMixin.java

@@ -1,5 +1,5 @@
 //? if sodium {
-/*package dev.isxander.controlify.compatibility.sodium.mixins;
+package dev.isxander.controlify.compatibility.sodium.mixins;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import dev.isxander.controlify.api.bind.InputBinding;
@@ -11,8 +11,6 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.Map;
 import java.util.Optional;
@@ -32,7 +30,7 @@ public class FlatButtonWidgetMixin implements ButtonGuideRenderer<FlatButtonWidg
     private final Map<InputBinding, Component> controllerMessages = new Object2ObjectArrayMap<>(2);
 
     @ModifyExpressionValue(
-            method = "render",
+            method = "extractRenderState",
             at = @At(
                     value = "FIELD",
                     target = "Lnet/caffeinemc/mods/sodium/client/gui/widgets/FlatButtonWidget;label:Lnet/minecraft/network/chat/Component;",
@@ -43,11 +41,6 @@ private Component modifyRenderedLabel(Component actualLabel) {
         return getControllerMessage(actualLabel);
     }
 
-    @Inject(method = "setLabel", at = @At("HEAD"))
-    private void removeLabelCache(CallbackInfo ci) {
-        this.controllerMessages.clear();
-    }
-
     @Unique
     private Component getControllerMessage(Component actualLabel) {
         if (!shouldRender())
@@ -78,4 +71,4 @@ private Optional<InputBinding> getBind() {
         this.controllerMessages.clear();
     }
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/SliderControlElementMixin.java

@@ -1,27 +1,26 @@
 //? if sodium {
-/*package dev.isxander.controlify.compatibility.sodium.mixins;
+package dev.isxander.controlify.compatibility.sodium.mixins;
 
 import dev.isxander.controlify.compatibility.sodium.screenop.SliderControlProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessorProvider;
-import net.minecraft.util.Mth;
-import org.spongepowered.asm.mixin.*;
-
-import net.caffeinemc.mods.sodium.client.gui.options.Option;
+import net.caffeinemc.mods.sodium.client.config.structure.IntegerOption;
+import net.caffeinemc.mods.sodium.client.gui.ColorTheme;
+import net.caffeinemc.mods.sodium.client.gui.options.control.AbstractOptionList;
 import net.caffeinemc.mods.sodium.client.gui.options.control.ControlElement;
 import net.caffeinemc.mods.sodium.client.util.Dim2i;
+import net.minecraft.util.Mth;
+import org.spongepowered.asm.mixin.*;
 
-@Mixin(targets = "net.caffeinemc.mods.sodium.client.gui.options.control.SliderControl$Button")
-public abstract class SliderControlElementMixin extends ControlElement<Integer> implements ComponentProcessorProvider {
-    @Shadow @Final private int interval;
-    @Shadow @Final private int min;
-    @Shadow @Final private int max;
+@Mixin(targets = "net.caffeinemc.mods.sodium.client.gui.options.control.SliderControl$SliderControlElement")
+public abstract class SliderControlElementMixin extends ControlElement implements ComponentProcessorProvider {
+    @Shadow @Final private IntegerOption option;
 
     @Unique private final ComponentProcessor controlify$componentProcessor
-            = new SliderControlProcessor(this::incrementSlider);
+            = new SliderControlProcessor(this::controlify$incrementSlider);
 
-    public SliderControlElementMixin(Option<Integer> option, Dim2i dim) {
-        super(option, dim);
+    public SliderControlElementMixin(AbstractOptionList list, Dim2i dim, ColorTheme theme) {
+        super(list, dim, theme);
     }
 
     @Override
@@ -30,8 +29,12 @@ public ComponentProcessor componentProcessor() {
     }
 
     @Unique
-    private void incrementSlider(boolean reverse) {
-        this.option.setValue(Mth.clamp(this.option.getValue() + (reverse ? -this.interval : this.interval), this.min, this.max));
+    private void controlify$incrementSlider(boolean reverse) {
+        var range = option.getSteppedValidator();
+        option.modifyValue(Mth.clamp(
+                option.getValidatedValue() + (reverse ? -range.step() : range.step()),
+                range.min(), range.max()
+        ));
     }
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/SodiumOptionsGUIMixin.java

@@ -1,5 +1,5 @@
 //? if sodium {
-/*package dev.isxander.controlify.compatibility.sodium.mixins;
+package dev.isxander.controlify.compatibility.sodium.mixins;
 
 import dev.isxander.controlify.compatibility.sodium.screenop.TickBoxControlProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessor;
@@ -10,7 +10,8 @@
 
 @Mixin(targets = "net.caffeinemc.mods.sodium.client.gui.options.control.TickBoxControl$TickBoxControlElement")
 public abstract class TickBoxControlElementMixin implements ComponentProcessorProvider {
-    @Shadow public abstract void toggleControl();
+    @Shadow
+    protected abstract void toggleControl();
 
     @Unique private final ComponentProcessor controlify$componentProcessor
             = new TickBoxControlProcessor(this::toggleControl);
@@ -20,4 +21,4 @@ public ComponentProcessor componentProcessor() {
         return controlify$componentProcessor;
     }
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/TickBoxControlElementMixin.java

@@ -0,0 +1,97 @@
+//? if sodium {
+package dev.isxander.controlify.compatibility.sodium.mixins;
+
+import dev.isxander.controlify.compatibility.sodium.screenop.SodiumGuiScreenProcessor;
+import dev.isxander.controlify.compatibility.sodium.screenop.SodiumScreenOperations;
+import dev.isxander.controlify.screenop.ScreenProcessor;
+import dev.isxander.controlify.screenop.ScreenProcessorProvider;
+import net.caffeinemc.mods.sodium.client.config.ConfigManager;
+import net.caffeinemc.mods.sodium.client.config.structure.Page;
+import net.caffeinemc.mods.sodium.client.gui.VideoSettingsScreen;
+import net.caffeinemc.mods.sodium.client.gui.widgets.FlatButtonWidget;
+import net.caffeinemc.mods.sodium.client.gui.widgets.OptionListWidget;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+
+@Mixin(VideoSettingsScreen.class)
+public abstract class VideoSettingsScreenMixin extends Screen implements ScreenProcessorProvider, SodiumScreenOperations {
+    @Shadow private FlatButtonWidget applyButton;
+    @Shadow private FlatButtonWidget closeButton;
+    @Shadow private FlatButtonWidget undoButton;
+    @Shadow private OptionListWidget optionList;
+
+    @Unique private Page controlify$currentPage = null;
+    @Unique private final SodiumGuiScreenProcessor controlify$screenProcessor
+            = new SodiumGuiScreenProcessor((VideoSettingsScreen) (Object) this, this);
+
+    protected VideoSettingsScreenMixin(Component title) {
+        super(title);
+    }
+
+    @Inject(method = "init", at = @At("RETURN"))
+    private void controlify$onInit(CallbackInfo ci) {
+        if (optionList != null && !optionList.getControls().isEmpty()) {
+            this.setInitialFocus(optionList.getControls().get(0));
+        }
+        controlify$screenProcessor.onRebuildGUI();
+    }
+
+    @Inject(method = "onSectionFocused", at = @At("HEAD"))
+    private void controlify$trackCurrentPage(Page page, CallbackInfo ci) {
+        controlify$currentPage = page;
+    }
+
+    @Override
+    public ScreenProcessor<?> screenProcessor() {
+        return controlify$screenProcessor;
+    }
+
+    @Override
+    public void controlify$nextPage() {
+        List<Page> pages = controlify$getAllPages();
+        if (pages.isEmpty()) return;
+        int currentIndex = controlify$currentPage != null ? pages.indexOf(controlify$currentPage) : -1;
+        int nextIndex = (currentIndex + 1) % pages.size();
+        jumpToPage(pages.get(nextIndex));
+    }
+
+    @Override
+    public void controlify$prevPage() {
+        List<Page> pages = controlify$getAllPages();
+        if (pages.isEmpty()) return;
+        int currentIndex = controlify$currentPage != null ? pages.indexOf(controlify$currentPage) : 0;
+        int nextIndex = (currentIndex - 1 + pages.size()) % pages.size();
+        jumpToPage(pages.get(nextIndex));
+    }
+
+    @Unique
+    private List<Page> controlify$getAllPages() {
+        return ConfigManager.CONFIG.getModOptions().stream()
+                .flatMap(mod -> mod.pages().stream())
+                .toList();
+    }
+
+    @Shadow public abstract void jumpToPage(Page page);
+
+    @Override
+    public FlatButtonWidget controlify$getApplyButton() {
+        return applyButton;
+    }
+
+    @Override
+    public FlatButtonWidget controlify$getCloseButton() {
+        return closeButton;
+    }
+
+    @Override
+    public FlatButtonWidget controlify$getUndoButton() {
+        return undoButton;
+    }
+}
+//?}