add a public ui kit and move oneconfig onto it

CHANGELOG.md

@@ -5,6 +5,39 @@ All notable changes to OneConfig are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.0] - 2026-11-14
+
+### Added
+- Mod cards and list entries can be moved with the keyboard: focus one and press Alt+Up or Alt+Down
+- Multi-select options have a Select all row
+- Deleting a profile now asks you to confirm first
+- API: The UI kit has enough controls to build a whole mod screen, including select fields, split buttons, dialogs, toasts, grid reordering and progress bars
+- API: `OneConfigComposeScreen`, HUD layers, inline canvases, offscreen rendering and entity previews for drawing with Compose in your own screens and HUDs
+- API: Theme tokens for state colours, typography, spacing, shapes and surfaces, and read-only player preferences such as Reduced Motion
+- API: Typed config metadata keys, a tree builder with group enable toggles, self-updating dependencies, share codes and per-profile config migrations
+- API: Custom pages that take an argument, typed destinations for `OneConfigUI.open` and read-only mod toggles
+- API: HUD styles, borders, cloning, click regions, styled text runs and icons
+- API: HUDs can hide or replace vanilla HUD elements, including the crosshair and attack indicator
+- API: Attack, place block, player turn and block update events
+- API: Keybinds can stay out of Minecraft's controls screen
+- API: Notification handles, a warning type and theme colours for notifications
+
+### Changed
+- Every OneConfig screen now uses the same controls, so buttons, menus, fields and tooltips look and behave the same everywhere
+- Menus open from the control you clicked, follow the theme's shape and panels, and give keyboard focus back when they close
+- Tooltips wait 300 ms before they show
+- A disabled option now dims its label and control instead of greying out the whole card
+- Number fields drop trailing zeros, so 0.50 shows as 0.5
+- Scrolling glides in lists added by mods
+- The HUD editor's selection box follows your theme's accent colour
+- Reduced Motion now also applies to page slides, scrolling and the HUD editor
+- API: The `Notifications` calls that take a float duration are deprecated in favour of `durationMillis`. Mods built against older versions keep working
+
+### Fixed
+- Fixed the keyboard focus ring never showing in the Minecraft themes
+- Colours stored inside a config object now load their saved value instead of the default
+- The resource reload event no longer fires a second time for server datapack reloads
+
 ## [1.7.1] - 2026-11-12
 
 ### Fixed

buildSrc/src/main/kotlin/OneConfigSetupPlugin.kt

@@ -432,6 +432,7 @@ class OneConfigSetupPlugin : Plugin<Project> {
         tasks.withType<KotlinCompile>().configureEach {
             // FixedScrollConfig relies on Compose internals, for which there is no public alternative
             compilerOptions.freeCompilerArgs.add("-Xdont-warn-on-error-suppression")
+            compilerOptions.optIn.add("org.polyfrost.oneconfig.api.ui.v1.InternalOneConfigUiApi")
         }
 
         tasks.withType<Jar>().configureEach {

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 
 group=org.polyfrost.oneconfig
-version=1.7.1
+version=1.8.0

minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/keybind/internal/MinecraftKeybindBridgeImpl.java

@@ -112,7 +112,7 @@ public static MinecraftKeybindBridgeImpl instance() {
 
     @Override
     public synchronized void register(OneConfigKeybind bind) {
-        if (bind.getName() == null) return;
+        if (bind.getName() == null || !bind.getMirrorToVanilla()) return;
         KeyMapping existing = mappings.get(bind);
         if (existing != null) {
             applyKeyTo(existing, bind);

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java

@@ -109,6 +109,10 @@ public class OneConfig implements ClientModInitializer {
     private static final Logger LOGGER = LogManager.getLogger("OneConfig");
     private boolean initialized = false;
 
+    public static boolean isInitialized() {
+        return INSTANCE.initialized;
+    }
+
     private static void registerCommands() {
         Command<FabricClientCommandSource> executor = (c) -> {
             OneConfigUIScreen.openLastSession();

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java

@@ -185,6 +185,10 @@ public List<String> getMixins() {
         mixins.add("events.Mixin_ModernWindowFocusEvent");
 
         mixins.add("skia.Mixin_SkiaFrame");
+        mixins.add("render.Mixin_FramePresentHooks");
+        mixins.add("render.Mixin_EntityPreviewNameTag");
+        mixins.add("render.Mixin_HudFrameState");
+        mixins.add("render.Mixin_VanillaHudElements");
         //? if >= 26.1 {
         mixins.add("blaze3d.GpuDeviceAccessor");
         mixins.add("blaze3d.GlDeviceAccessor");

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_SimpleReloadInstance.java

@@ -1,27 +1,45 @@
 package org.polyfrost.oneconfig.internal.mixin;
 
 import net.minecraft.server.packs.resources.ReloadInstance;
-import net.minecraft.server.packs.resources.SimpleReloadInstance;
 import org.polyfrost.oneconfig.api.event.v1.EventManager;
 import org.polyfrost.oneconfig.api.event.v1.events.ResourceFinishedLoading;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-//~ if = 1.8.9 'SimpleReloadInstance' -> 'SimpleReloadableResourceManager'
-@Mixin(SimpleReloadInstance.class)
+//? if > 1.8.9 {
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
+
+@Mixin(ReloadableResourceManager.class)
 public class Mixin_SimpleReloadInstance {
 
-    //~ if = 1.8.9 'create' -> 'startReload'
-    @Inject(method = "create", at = @At("RETURN"))
-    //~ if = 1.8.9 'ReloadInstance' -> 'ResourceReload'
-    private static void oneconfig$onResourceFinishedLoading(CallbackInfoReturnable<ReloadInstance> cir) {
-        //~ if = 1.8.9 'done()' -> 'result()'
+    @Inject(method = "createReload", at = @At("RETURN"))
+    private void oneconfig$onResourceFinishedLoading(CallbackInfoReturnable<ReloadInstance> cir) {
         cir.getReturnValue().done().whenComplete((result, throwable) -> {
             if (throwable != null) return;
             EventManager.INSTANCE.post(ResourceFinishedLoading.INSTANCE);
         });
     }
 
 }
+//?} else {
+/*import net.minecraft.server.packs.resources.SimpleReloadInstance;
+
+@Mixin(SimpleReloadableResourceManager.class)
+public class Mixin_SimpleReloadInstance {
+
+    @Inject(
+            method = "startReload(Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/ornithemc/osl/resource/loader/api/resource/reload/ResourceReload;",
+            at = @At("RETURN")
+    )
+    private void oneconfig$onResourceFinishedLoading(CallbackInfoReturnable<ResourceReload> cir) {
+        if ((Object) this != SimpleReloadableResourceManager.client()) return;
+        cir.getReturnValue().result().whenComplete((result, throwable) -> {
+            if (throwable != null) return;
+            EventManager.INSTANCE.post(ResourceFinishedLoading.INSTANCE);
+        });
+    }
+
+}
+*///?}

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_AttackEntityEvent.java

@@ -0,0 +1,44 @@
+package org.polyfrost.oneconfig.internal.mixin.events;
+
+import org.polyfrost.oneconfig.api.event.v1.EventManager;
+import org.polyfrost.oneconfig.api.event.v1.events.AttackEntityEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+//? if > 1.8.9 {
+import net.minecraft.client.multiplayer.MultiPlayerGameMode;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+//?} else {
+/*import net.minecraft.client.ClientPlayerInteractionManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.living.player.PlayerEntity;
+*///?}
+
+//? if > 1.8.9 {
+@Mixin(MultiPlayerGameMode.class)
+public class Mixin_AttackEntityEvent {
+    @Inject(method = "attack", at = @At("HEAD"), cancellable = true)
+    private void ocfg$onAttack(Player player, Entity target, CallbackInfo ci) {
+        AttackEntityEvent event = new AttackEntityEvent(player, target);
+        EventManager.INSTANCE.post(event);
+        if (event.cancelled) {
+            ci.cancel();
+        }
+    }
+}
+//?} else {
+/*@Mixin(ClientPlayerInteractionManager.class)
+public class Mixin_AttackEntityEvent {
+    @Inject(method = "attackEntity", at = @At("HEAD"), cancellable = true)
+    private void ocfg$onAttack(PlayerEntity player, Entity target, CallbackInfo ci) {
+        AttackEntityEvent event = new AttackEntityEvent(player, target);
+        EventManager.INSTANCE.post(event);
+        if (event.cancelled) {
+            ci.cancel();
+        }
+    }
+}
+*///?}

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_BlockUpdateEvent.java

@@ -0,0 +1,50 @@
+package org.polyfrost.oneconfig.internal.mixin.events;
+
+import org.polyfrost.oneconfig.api.event.v1.EventManager;
+import org.polyfrost.oneconfig.api.event.v1.events.BlockUpdateEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+//? if > 1.8.9 {
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket;
+
+@Mixin(ClientPacketListener.class)
+public class Mixin_BlockUpdateEvent {
+    @Inject(method = "handleBlockUpdate", at = @At("TAIL"))
+    private void ocfg$onBlockUpdate(ClientboundBlockUpdatePacket packet, CallbackInfo ci) {
+        if (!EventManager.INSTANCE.hasListeners(BlockUpdateEvent.class)) return;
+        EventManager.INSTANCE.post(new BlockUpdateEvent(packet.getPos(), packet.getBlockState()));
+    }
+
+    @Inject(method = "handleChunkBlocksUpdate", at = @At("TAIL"))
+    private void ocfg$onSectionBlocksUpdate(ClientboundSectionBlocksUpdatePacket packet, CallbackInfo ci) {
+        if (!EventManager.INSTANCE.hasListeners(BlockUpdateEvent.class)) return;
+        packet.runUpdates((pos, state) -> EventManager.INSTANCE.post(new BlockUpdateEvent(pos.immutable(), state)));
+    }
+}
+//?} else {
+/*import net.minecraft.client.network.handler.ClientPlayNetworkHandler;
+import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
+import net.minecraft.network.packet.s2c.play.BlocksUpdateS2CPacket;
+
+@Mixin(ClientPlayNetworkHandler.class)
+public class Mixin_BlockUpdateEvent {
+    @Inject(method = "handleBlockUpdate", at = @At("TAIL"))
+    private void ocfg$onBlockUpdate(BlockUpdateS2CPacket packet, CallbackInfo ci) {
+        if (!EventManager.INSTANCE.hasListeners(BlockUpdateEvent.class)) return;
+        EventManager.INSTANCE.post(new BlockUpdateEvent(packet.getPos(), packet.getBlockState()));
+    }
+
+    @Inject(method = "handleBlocksUpdate", at = @At("TAIL"))
+    private void ocfg$onSectionBlocksUpdate(BlocksUpdateS2CPacket packet, CallbackInfo ci) {
+        if (!EventManager.INSTANCE.hasListeners(BlockUpdateEvent.class)) return;
+        for (BlocksUpdateS2CPacket.BlockUpdate update : packet.getUpdates()) {
+            EventManager.INSTANCE.post(new BlockUpdateEvent(update.getBlockPos(), update.getBlockState()));
+        }
+    }
+}
+*///?}

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent.java

@@ -4,6 +4,7 @@
 import org.polyfrost.oneconfig.api.event.v1.EventManager;
 import org.polyfrost.oneconfig.api.event.v1.events.KeyInputEvent;
 import org.polyfrost.oneconfig.api.platform.v1.Platform;
+import org.polyfrost.oneconfig.api.ui.v1.platform.ComposeHudInput;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -22,6 +23,7 @@
 
 //? if = 1.8.9 {
 /*import org.lwjgl.input.Keyboard;
+import org.polyfrost.oneconfig.internal.legacy.KeyCodes;
 import org.polyfrost.oneconfig.internal.legacy.LegacyInputEvents;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 *///?}
@@ -31,6 +33,13 @@
 public class Mixin_KeyInputEvent {
 
     //? if >= 1.21.10 {
+    @Inject(method = "keyPress", at = @At("HEAD"), cancellable = true)
+    private void oneconfig$hudEscape(long handle, int action, KeyEvent event, CallbackInfo ci) {
+        if (handle == Platform.compatibility().windowHandle() && ComposeHudInput.consumeKey(event.key(), oneconfig$state(action))) {
+            ci.cancel();
+        }
+    }
+
     @ModifyVariable(method = "keyPress", at = @At(value = "STORE"), ordinal = 0)
     private boolean keyCallback(boolean original, long handle, int action, KeyEvent event) {
         EventManager.INSTANCE.post(new KeyInputEvent(event.key(), (char) 0, oneconfig$state(action)));
@@ -46,8 +55,12 @@ private void charCallback(long handle, CharacterEvent event, CallbackInfo ci) {
         EventManager.INSTANCE.post(new KeyInputEvent(0, (char) event.codepoint(), KeyInputEvent.PRESSED));
     }
     //?} elif > 1.8.9 {
-    /*@Inject(method = "keyPress", at = @At("HEAD"))
+    /*@Inject(method = "keyPress", at = @At("HEAD"), cancellable = true)
     private void keyCallback(long window, int key, int scancode, int action, int mods, CallbackInfo ci) {
+        if (window == Platform.compatibility().windowHandle() && ComposeHudInput.consumeKey(key, oneconfig$state(action))) {
+            ci.cancel();
+            return;
+        }
         EventManager.INSTANCE.post(new KeyInputEvent(key, (char) 0, oneconfig$state(action)));
     }
 
@@ -59,9 +72,22 @@ private void charCallback(long window, int codepoint, int mods, CallbackInfo ci)
         EventManager.INSTANCE.post(new KeyInputEvent(0, (char) codepoint, KeyInputEvent.PRESSED));
     }
     *///?} else {
-    /*@Inject(method = "next", at = @At("RETURN"), remap = false)
+    /*@Inject(method = "next", at = @At("RETURN"), remap = false, cancellable = true)
     private static void keyCallback(CallbackInfoReturnable<Boolean> cir) {
-        if (cir.getReturnValue() && !LegacyInputEvents.deferred) LegacyInputEvents.postKeyboard();
+        if (!cir.getReturnValue() || LegacyInputEvents.deferred) return;
+        if (oneconfig$hudConsumesLegacy()) {
+            cir.setReturnValue(Keyboard.next());
+            return;
+        }
+        LegacyInputEvents.postKeyboard();
+    }
+
+    @Unique
+    private static boolean oneconfig$hudConsumesLegacy() {
+        int keyCode = Keyboard.getEventKey();
+        if (keyCode <= 0) return false;
+        int state = Keyboard.isRepeatEvent() ? KeyInputEvent.REPEAT : Keyboard.getEventKeyState() ? KeyInputEvent.PRESSED : KeyInputEvent.RELEASED;
+        return ComposeHudInput.consumeKey(KeyCodes.fromLegacy(keyCode).getValue(), state);
     }
     *///?}
 

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent.java

@@ -5,6 +5,7 @@
 import org.polyfrost.oneconfig.api.event.v1.EventManager;
 import org.polyfrost.oneconfig.api.event.v1.events.MouseInputEvent;
 import org.polyfrost.oneconfig.api.notifications.v1.NotificationsRenderer;
+import org.polyfrost.oneconfig.api.ui.v1.platform.ComposeHudInput;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -22,6 +23,7 @@
 
 //? if = 1.8.9 {
 /*import org.lwjgl.input.Mouse;
+import org.polyfrost.oneconfig.internal.legacy.KeyCodes;
 import org.polyfrost.oneconfig.internal.legacy.LegacyInputEvents;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 *///?}
@@ -34,7 +36,7 @@ public class Mixin_MouseInputEvent {
     //? if >= 1.21.10 {
     @Inject(method = "onButton", at = @At("HEAD"), cancellable = true)
     private void mouseCallback(long window, MouseButtonInfo buttonInfo, int action, CallbackInfo ci) {
-        if (oneconfig$toastConsumes(buttonInfo.button(), action)) {
+        if (oneconfig$toastConsumes(buttonInfo.button(), action) || oneconfig$hudConsumes(buttonInfo.button(), action)) {
             ci.cancel();
             return;
         }
@@ -56,7 +58,7 @@ private void mouseMoveCallback(long handle, double x, double y, double xrel, dou
     //?} elif > 1.8.9 {
     /*@Inject(method = "onPress", at = @At("HEAD"), cancellable = true)
     private void mouseCallback(long handle, int button, int action, int mods, CallbackInfo ci) {
-        if (oneconfig$toastConsumes(button, action)) {
+        if (oneconfig$toastConsumes(button, action) || oneconfig$hudConsumes(button, action)) {
             ci.cancel();
             return;
         }
@@ -72,14 +74,27 @@ private void mouseMoveCallback(long handle, double x, double y, CallbackInfo ci)
     *///?} else {
     /*@Inject(method = "next", at = @At("RETURN"), remap = false, cancellable = true)
     private static void mouseCallback(CallbackInfoReturnable<Boolean> cir) {
-        if (cir.getReturnValue() && !LegacyInputEvents.deferred && LegacyInputEvents.postMouse()) cir.setReturnValue(Mouse.next());
+        if (cir.getReturnValue() && !LegacyInputEvents.deferred && (oneconfig$hudConsumesLegacy() || LegacyInputEvents.postMouse())) cir.setReturnValue(Mouse.next());
+    }
+
+    @Unique
+    private static boolean oneconfig$hudConsumesLegacy() {
+        int button = Mouse.getEventButton();
+        if (button >= 0) {
+            boolean pressed = Mouse.getEventButtonState();
+            if (pressed && NotificationsRenderer.isPointerOverToast()) return false;
+            return ComposeHudInput.consumeButton(KeyCodes.mouseFromLegacy(button), pressed);
+        }
+        double wheel = Mouse.getEventDWheelPrecise();
+        if (wheel == 0.0 || NotificationsRenderer.isPointerOverToast()) return false;
+        return ComposeHudInput.consumeScroll(0.0, wheel);
     }
     *///? }
 
     //? if > 1.8.9 {
     @Inject(method = "onScroll", at = @At("HEAD"), cancellable = true)
     private void oneconfig$captureRawScroll(long window, double x, double y, CallbackInfo ci) {
-        if (NotificationsRenderer.isPointerOverToast()) {
+        if (NotificationsRenderer.isPointerOverToast() || ComposeHudInput.consumeScroll(x, y)) {
             ci.cancel();
             return;
         }
@@ -94,6 +109,12 @@ private static void mouseCallback(CallbackInfoReturnable<Boolean> cir) {
         return NotificationsRenderer.consumeMouseButton(button, action == InputConstants.PRESS);
     }
 
+    @Unique
+    private static boolean oneconfig$hudConsumes(int button, int action) {
+        if (action != InputConstants.PRESS && action != InputConstants.RELEASE) return false;
+        return ComposeHudInput.consumeButton(button, action == InputConstants.PRESS);
+    }
+
     @Unique
     private static int oneconfig$state(int action) {
         if (action == InputConstants.PRESS) return MouseInputEvent.PRESSED;