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
@@ -17,7 +16,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

@@ -33,7 +33,7 @@ object Redaction
 
     private fun initialize() {
         RedactionConfig.preload()
-        CommandManager.registerCommand(RedactionCommand())
+        CommandManager.register(RedactionCommand())
         ServerManager.initialize()
     }
 

src/main/kotlin/org/polyfrost/redaction/Redaction.kt

@@ -8,12 +8,12 @@ import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToSe
 //$$ import net.legacyfabric.fabric.api.client.networking.v1.ClientPlayConnectionEvents
 //#endif
 
+import dev.deftu.omnicore.client.OmniClientMultiplayer
 import org.polyfrost.oneconfig.api.ui.v1.Notifications
 import org.polyfrost.oneconfig.utils.v1.JsonUtils
 import org.polyfrost.oneconfig.utils.v1.Multithreading
 import org.polyfrost.redaction.Redaction
 import org.polyfrost.redaction.config.RedactionConfig
-import org.polyfrost.universal.UMinecraft
 
 object ServerManager {
 
@@ -56,8 +56,8 @@ object ServerManager {
     //#endif
 
     private fun saveLastServerIp() {
-        if (!UMinecraft.getMinecraft().isIntegratedServerRunning) { // Don't save the IP if we're connected/connecting to a singleplayer world
-            RedactionConfig.lastServerIP = UMinecraft.getMinecraft().currentServerData?.serverIP ?: ""
+        if (OmniClientMultiplayer.isInSingleplayer) { // Don't save the IP if we're connected/connecting to a singleplayer world
+            RedactionConfig.lastServerIP = OmniClientMultiplayer.currentServerAddress ?: ""
             RedactionConfig.save()
         }
     }

src/main/kotlin/org/polyfrost/redaction/features/ServerManager.kt

@@ -1,8 +1,8 @@
 package org.polyfrost.redaction.features.particles
 
+import dev.deftu.omnicore.client.render.OmniResolution
 import net.minecraft.client.Minecraft
 import org.polyfrost.redaction.utils.RenderUtils
-import org.polyfrost.universal.UResolution
 import kotlin.random.Random
 
 /**
@@ -30,8 +30,8 @@ class Particle internal constructor(var x: Float, var y: Float) {
         val mc = Minecraft.getMinecraft()
         if (y > mc.displayHeight) y = 1f
         if (x > mc.displayWidth) x = 1f
-        if (x < 1) x = UResolution.scaledWidth.toFloat()
-        if (y < 1) y = UResolution.scaledHeight.toFloat()
+        if (x < 1) x = OmniResolution.scaledWidth.toFloat()
+        if (y < 1) y = OmniResolution.scaledHeight.toFloat()
     }
 
     companion object {