Address lots of warnings and general code cleanup

Author: DenWav

buildSrc/src/main/kotlin/mcdev-core.gradle.kts

@@ -67,6 +67,7 @@ kotlin {
     compilerOptions {
         jvmTarget = JvmTarget.JVM_21
         languageVersion = KotlinVersion.KOTLIN_2_2
+        apiVersion = KotlinVersion.KOTLIN_2_2
         jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
         freeCompilerArgs = listOf("-Xjdk-release=21")
         optIn.add("kotlin.contracts.ExperimentalContracts")

gradle/libs.versions.toml

@@ -1,14 +1,21 @@
 [versions]
-kotlin = "2.3.20"
+# https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlin_stdlib.xml
+kotlin = "2.2.0-RC2"
+# https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlinx_coroutines_core.xml
 coroutines = "1.10.2"
 junit = "6.0.3"
 asm = "9.9.1"
 fuel = "2.3.1"
 licenser = "0.7.5"
 changelog = "2.5.0"
+# https://github.com/JetBrains/intellij-platform-gradle-plugin
 intellij-plugin = "2.13.1"
+# https://central.sonatype.com/artifact/org.jetbrains.intellij/plugin-repository-rest-client
 intellij-plugin-repository-rest-client = "2.0.50"
+# https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
+# Search for com.jetbrains.intellij.idea
 intellij-ide = "2025.2"
+# https://github.com/JetBrains/gradle-idea-ext-plugin
 idea-ext = "1.4.1"
 
 [plugins]
@@ -42,6 +49,8 @@ jflex-skeleton = "org.jetbrains.idea:jflex:1.7.0-c1fdf11"
 grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
 
 # Gradle Tooling
+# https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
+# Search for com.jetbrains.intellij.gradle
 gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "252.23892.409" }
 annotations = "org.jetbrains:annotations:26.1.0"
 groovy = "org.codehaus.groovy:groovy:3.0.25"

src/main/kotlin/TranslationSettings.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -21,18 +21,20 @@
 package com.demonwav.mcdev
 
 import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 
+@Service(Service.Level.PROJECT)
 @State(name = "TranslationSettings", storages = [Storage("minecraft_dev.xml")])
 class TranslationSettings : PersistentStateComponent<TranslationSettings.State> {
 
     data class State(
         var isForceJsonTranslationFile: Boolean = false,
         var isUseCustomConvertToTranslationTemplate: Boolean = false,
-        var convertToTranslationTemplate: String = "net.minecraft.client.resources.I18n.format(\"\$key\")",
+        var convertToTranslationTemplate: String = $$"net.minecraft.client.resources.I18n.format(\"$key\")",
     )
 
     private var state = State()

src/main/kotlin/asset/GeneralAssets.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -20,7 +20,6 @@
 
 package com.demonwav.mcdev.asset
 
-@Suppress("unused")
 object GeneralAssets : Assets() {
     val LISTENER = loadIcon("/assets/icons/general/EventListener_dark.png")
     val PLUGIN = loadIcon("/assets/icons/general/plugin.png")

src/main/kotlin/creator/JdkComboBoxWithPreference.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -89,8 +89,8 @@ class JdkComboBoxWithPreference internal constructor(
             preferenceData.jdk = version
             reloadModel()
 
-            for (jdkVersion in version.ordinal until JavaSdkVersion.values().size) {
-                val jdk = JavaSdkVersion.values()[jdkVersion]
+            for (jdkVersion in version.ordinal until JavaSdkVersion.entries.size) {
+                val jdk = JavaSdkVersion.entries[jdkVersion]
 
                 val preferredSdkPath = preferenceData.sdkPathByJdk[jdk]
                 if (preferredSdkPath != null) {
@@ -145,7 +145,7 @@ fun Row.jdkComboBoxWithPreference(
         for (preferenceDataStr in preferenceDataStrs) {
             val parts = preferenceDataStr.split('=', limit = 2)
             val featureVersion = parts.firstOrNull()?.toIntOrNull() ?: continue
-            val knownJdkVersions = JavaSdkVersion.values()
+            val knownJdkVersions = JavaSdkVersion.entries
             if (featureVersion !in knownJdkVersions.indices) {
                 continue
             }

src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -21,7 +21,6 @@
 package com.demonwav.mcdev.creator
 
 import com.demonwav.mcdev.asset.MCDevBundle
-import com.demonwav.mcdev.creator.ProjectSetupFinalizer.Factory
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.util.mapFirstNotNull
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep

src/main/kotlin/creator/buildsystem/GradleFile.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -224,7 +224,7 @@ private fun makeStringLiteral(str: String): String {
 }
 
 private fun escapeGString(str: String): String {
-    return StringUtil.escapeStringCharacters(str.length, str, "\"\$", StringBuilder()).toString()
+    return StringUtil.escapeStringCharacters(str.length, str, "\"$", StringBuilder()).toString()
 }
 
 private fun makePluginStatement(plugin: GradlePlugin, kotlin: Boolean): String {

src/main/kotlin/creator/custom/BuiltinValidations.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -65,7 +65,7 @@ object BuiltinValidations {
     }
 
     fun byRegex(regex: Regex): DialogValidation.WithParameter<() -> String> =
-        validationErrorIf<String>(MCDevBundle("creator.validation.regex", regex)) { !it.matches(regex) }
+        validationErrorIf(MCDevBundle("creator.validation.regex", regex)) { !it.matches(regex) }
 
     fun <T> isAnyOf(
         selectionGetter: () -> T,

src/main/kotlin/creator/custom/CreatorCredentials.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -148,8 +148,8 @@ object CreatorCredentials {
         // First check credentials in IntelliJ IDEA
         if (repoData.username.isNotBlank()) {
             val credentials = getCredentials(repoData.url, repoData.username)
-            var username = credentials?.userName
-            var password = credentials?.getPasswordAsString()
+            val username = credentials?.userName
+            val password = credentials?.getPasswordAsString()
             if (username != null && password != null) {
                 return username to password
             }

src/main/kotlin/creator/custom/CustomPlatformStep.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -59,6 +59,7 @@ import kotlinx.coroutines.launch
 /**
  * The step to select a custom template repo.
  */
+@Suppress("RemoveExplicitTypeArguments")
 class CustomPlatformStep(
     parent: NewProjectWizardStep,
 ) : AbstractNewProjectWizardStep(parent) {