Bump to OneConfig A70

Author: Deftu

build.gradle.kts

@@ -1,7 +1,6 @@
 @file:Suppress("UnstableApiUsage", "PropertyName")
 
 import dev.deftu.gradle.utils.GameSide
-import dev.deftu.gradle.utils.MinecraftVersion
 
 plugins {
     java
@@ -18,7 +17,7 @@ plugins {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.62"
+        version = "1.0.0-alpha.70"
         loaderVersion = "1.1.0-alpha.44"
 
         usePolyMixin = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -24,7 +24,7 @@ pluginManagement {
 
     plugins {
         kotlin("jvm") version("2.0.0")
-        id("dev.deftu.gradle.multiversion-root") version("2.22.0")
+        id("dev.deftu.gradle.multiversion-root") version("2.27.1")
     }
 }
 

settings.gradle.kts

@@ -29,9 +29,9 @@ import net.minecraftforge.fml.common.gameevent.InputEvent
 //$$ import net.legacyfabric.fabric.api.client.event.lifecycle.v1.ClientTickEvents
 //#endif
 
+import dev.deftu.omnicore.client.OmniClient
 import org.polyfrost.oneconfig.api.commands.v1.CommandManager
 import org.polyfrost.oneconfig.api.hud.v1.HudManager
-import org.polyfrost.universal.UMinecraft
 
 //#if FORGE
 @Mod(modid = PolySprint.ID, version = PolySprint.VERSION, name = PolySprint.NAME, modLanguageAdapter = "org.polyfrost.oneconfig.utils.v1.forge.KotlinLanguageAdapter")
@@ -45,10 +45,6 @@ object PolySprint
     const val ID = "@MOD_ID@"
     const val NAME = "@MOD_NAME@"
     const val VERSION = "@MOD_VERSION@"
-    val player
-        get() = UMinecraft.getPlayer()
-    val gameSettings
-        get() = UMinecraft.getSettings()
 
     var sprintHeld = false
     var sneakHeld = false
@@ -59,16 +55,17 @@ object PolySprint
 
     private fun postInitialize() {
         HudManager.register(PolySprintHud())
-        CommandManager.registerCommand(PolySprintCommand())
+        CommandManager.register(PolySprintCommand())
     }
 
     private fun handleInput() {
         if (!PolySprintConfig.enabled) {
             return
         }
 
-        val sprint = gameSettings.keyBindSprint.keyCode
-        val sneak = gameSettings.keyBindSneak.keyCode
+        val options = OmniClient.getInstance().gameSettings
+        val sprint = options.keyBindSprint.keyCode
+        val sneak = options.keyBindSneak.keyCode
 
         if (!PolySprintConfig.keybindToggleSprint && checkKeyCode(sprint)) {
             if (PolySprintConfig.enabled && PolySprintConfig.toggleSprint && !sprintHeld) {

src/main/kotlin/org/polyfrost/polysprint/PolySprint.kt

@@ -18,14 +18,14 @@
 
 package org.polyfrost.polysprint
 
+import dev.deftu.omnicore.client.OmniKeyboard
 import org.polyfrost.oneconfig.api.config.v1.Config
 import org.polyfrost.oneconfig.api.config.v1.annotations.Include
 import org.polyfrost.oneconfig.api.config.v1.annotations.Keybind
 import org.polyfrost.oneconfig.api.config.v1.annotations.Slider
 import org.polyfrost.oneconfig.api.config.v1.annotations.Switch
 import org.polyfrost.oneconfig.api.ui.v1.keybind.KeybindManager.registerKeybind
 import org.polyfrost.polyui.input.KeybindHelper
-import org.polyfrost.universal.UKeyboard
 
 object PolySprintConfig : Config(
     //VigilanceMigrator(File("./config/simpletogglesprint.toml").absolutePath),
@@ -63,7 +63,7 @@ object PolySprintConfig : Config(
         title = "Toggle Sprint Keybind",
         subcategory = "Toggle Sprint"
     )
-    var keybindToggleSprintKey = KeybindHelper.builder().keys(UKeyboard.KEY_NONE).does {
+    var keybindToggleSprintKey = KeybindHelper.builder().keys(OmniKeyboard.KEY_NONE).does {
         if (keybindToggleSprint) {
             if (enabled && toggleSprint && !PolySprint.sprintHeld) {
                 toggleSprintState = !toggleSprintState
@@ -84,7 +84,7 @@ object PolySprintConfig : Config(
         title = "Toggle Sneak Keybind",
         subcategory = "Toggle Sneak"
     )
-    var keybindToggleSneakKey = KeybindHelper.builder().keys(UKeyboard.KEY_NONE).does {
+    var keybindToggleSneakKey = KeybindHelper.builder().keys(OmniKeyboard.KEY_NONE).does {
         if (keybindToggleSneak) {
             if (enabled && toggleSneak && !PolySprint.sneakHeld) {
                 toggleSneakState = !toggleSneakState

src/main/kotlin/org/polyfrost/polysprint/PolySprintConfig.kt

@@ -18,26 +18,27 @@
 
 package org.polyfrost.polysprint
 
+import dev.deftu.omnicore.client.*
 import net.minecraft.client.settings.KeyBinding
-import org.lwjgl.input.Mouse
 import org.polyfrost.oneconfig.api.hypixel.v1.HypixelUtils
-import org.polyfrost.polysprint.PolySprint.gameSettings
-import org.polyfrost.polysprint.PolySprint.player
-import org.polyfrost.universal.UKeyboard
-import org.polyfrost.universal.UScreen
 
 fun shouldSetSprint(keyBinding: KeyBinding): Boolean {
-    return keyBinding.isKeyDown || UScreen.currentScreen == null && PolySprintConfig.enabled && PolySprintConfig.toggleSprint && PolySprintConfig.toggleSprintState
+    return keyBinding.isKeyDown || !OmniScreen.isInScreen && PolySprintConfig.enabled && PolySprintConfig.toggleSprint && PolySprintConfig.toggleSprintState
 }
 
 fun shouldSetSneak(keyBinding: KeyBinding): Boolean {
-    return keyBinding.isKeyDown || UScreen.currentScreen == null && PolySprintConfig.enabled && PolySprintConfig.toggleSneak && PolySprintConfig.toggleSneakState
+    return keyBinding.isKeyDown || !OmniScreen.isInScreen && PolySprintConfig.enabled && PolySprintConfig.toggleSneak && PolySprintConfig.toggleSneakState
 }
 
 fun shouldFlyBoost(): Boolean {
-    return gameSettings.keyBindSprint.isKeyDown && PolySprintConfig.enabled && PolySprintConfig.toggleFlyBoost && player!!.capabilities.isFlying && player!!.capabilities.isCreativeMode && !HypixelUtils.isHypixel()
+    val player = OmniClientPlayer.getInstance() ?: return false
+    return OmniClient.getInstance().gameSettings.keyBindSprint.isKeyDown && PolySprintConfig.enabled && PolySprintConfig.toggleFlyBoost && player.capabilities.isFlying && player.capabilities.isCreativeMode && !HypixelUtils.isHypixel()
 }
 
-fun checkKeyCode(keyCode: Int) = if (keyCode > 0) UKeyboard.isKeyDown(keyCode) else Mouse.isButtonDown(
-    keyCode + 100
-)
+fun checkKeyCode(keyCode: Int): Boolean {
+    return if (keyCode > 0) {
+        OmniKeyboard.isPressed(keyCode)
+    } else {
+        OmniMouse.isPressed(keyCode + 100)
+    }
+}