ui

Author: mariethepolarfox

build.gradle.kts

@@ -2,10 +2,12 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "2.3.0"
+    kotlin("jvm") version "2.4.0"
     id("dev.kikugie.loom-back-compat")
     id("dev.deftu.gradle.bloom") version "0.2.0"
     id("me.modmuss50.mod-publish-plugin") version "2.0.0"
+    id("org.jetbrains.compose") version "1.11.0"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.4.0"
 }
 
 val modid = property("mod.id")
@@ -16,6 +18,7 @@ val versionoverride = property("minecraft_version")
 
 val loaderversion = property("loader_version")
 val oneconfigversion = property("oneconfig_version")
+val fapiversion = property("fabric_api_version")
 
 val necversion = property("nec_version")
 
@@ -52,6 +55,7 @@ dependencies {
     loomx.applyMojangMappings()
 
     modImplementation("net.fabricmc:fabric-loader:$loaderversion")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:$fapiversion")
     modImplementation("maven.modrinth:notenoughcrashes:$necversion+$mcversion-fabric")
     implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-common:0.3.3")!!)
     implementation("gs.mclo:api:3.0.1")
@@ -60,6 +64,7 @@ dependencies {
     for (module in arrayOf("config", "config-impl", "internal")) {
         implementation("org.polyfrost.oneconfig:$module:$oneconfigversion")
     }
+    compileOnly(compose.desktop.currentOs)
 }
 
 bloom {

src/main/java/org/polyfrost/crashpatch/mixin/Mixin_CrashPatchInitUI.java

@@ -6,7 +6,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import org.polyfrost.crashpatch.client.gui.CrashUI;
-import org.polyfrost.oneconfig.api.ui.v1.internal.wrappers.PolyUIScreen;
 import org.polyfrost.oneconfig.internal.ui.compose.ComposeScreen;import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/main/kotlin/org/polyfrost/crashpatch/client/CrashPatchClient.kt

@@ -1,11 +1,16 @@
 package org.polyfrost.crashpatch.client
 
 import com.mojang.brigadier.Command
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback
+import net.fabricmc.fabric.api.client.command.v2.ClientCommands
+import net.minecraft.network.chat.Component
+import net.minecraft.util.CommonColors
 import org.apache.logging.log4j.LogManager
 import org.polyfrost.crashpatch.CrashPatchConstants
+import org.polyfrost.crashpatch.client.CrashPatchClient.isSkyClient
 import org.polyfrost.crashpatch.client.crashes.CrashScanner
 import org.polyfrost.oneconfig.utils.v1.Multithreading
-import org.polyfrost.oneconfig.utils.v1.dsl.createScreen
+import org.polyfrost.oneconfig.utils.v1.dsl.mc
 import kotlin.io.path.exists
 
 object CrashPatchClient {
@@ -33,27 +38,21 @@ object CrashPatchClient {
     fun initialize() {
         CrashPatchConfig.preload() // Initialize the config
 
-        OmniClientCommands.command(CrashPatchConstants.ID) {
-            runs { ctx ->
-                ctx.source.openScreen(CrashPatchConfig.createScreen())
-            }
-
-            then("reload") {
-                runs { ctx ->
-                    val success = CrashScanner.submitCacheRequest()
-
-                    val content = "Requested reload of crash data! Please wait." to TextColors.GREEN
-                    val (message, color) = content
-                    ctx.source.replyChat(Text.literal("[${CrashPatchConstants.NAME}] $message").setStyle(MCTextStyle.color(color)))
-                }
-            }
-
-            then("crash") {
-                runs { ctx ->
-                    isCrashRequested = true
-                    Command.SINGLE_SUCCESS
-                }
-            }
-        }.register()
+        ClientCommandRegistrationCallback.EVENT.register { dispatcher, _ ->
+            dispatcher.register(
+                ClientCommands.literal("crashpatch")
+                    .then(ClientCommands.literal("reload").executes {
+                        CrashScanner.submitCacheRequest()
+                        val content = "Requested reload of crash data! Please wait." to CommonColors.GREEN
+                        val (message, color) = content
+                        mc.gui.chat.addClientSystemMessage(Component.literal("[${CrashPatchConstants.NAME}] $message").withColor(color))
+                        Command.SINGLE_SUCCESS
+                    })
+                    .then(ClientCommands.literal("crash").executes {
+                        isCrashRequested = true
+                        Command.SINGLE_SUCCESS
+                    })
+            )
+        }
     }
 }