Minor fixes and cleanup

Author: DenWav

.editorconfig

@@ -1,2 +1,4 @@
 [*.{kt,kts}]
 max_line_length=120
+# noinspection EditorConfigKeyCorrectness
+kotlin_imports_layout=ascii

build.gradle.kts

@@ -24,7 +24,7 @@ plugins {
     idea
     id("org.jetbrains.intellij") version "0.4.21"
     id("net.minecrell.licenser") version "0.4.1"
-    id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
+    id("org.jlleitschuh.gradle.ktlint") version "9.3.0"
 }
 
 apply(from = "gradle/attach-sources.gradle.kts")

src/main/kotlin/com/demonwav/mcdev/platform/fabric/creator/FabricProjectCreator.kt

@@ -89,9 +89,7 @@ class FabricProjectCreator(
         if (config.mixins) {
             steps += MixinConfigStep(project, buildSystem)
         }
-        for (entry in config.entryPoints.groupBy { it.className }.entries.sortedBy { it.key }) {
-            steps += CreateEntryPointStep(project, buildSystem, entry.key, entry.value)
-        }
+        createPostSteps(steps)
         steps += FabricModJsonStep(project, buildSystem, config)
         return steps
     }
@@ -119,11 +117,15 @@ class FabricProjectCreator(
 
     override fun getPostMultiModuleSteps(projectBaseDir: Path): Iterable<CreatorStep> {
         val steps = mutableListOf<CreatorStep>()
+        createPostSteps(steps)
+        steps += FabricModJsonStep(project, buildSystem, config)
+        return steps
+    }
+
+    private fun createPostSteps(steps: MutableList<CreatorStep>) {
         for (entry in config.entryPoints.groupBy { it.className }.entries.sortedBy { it.key }) {
             steps += CreateEntryPointStep(project, buildSystem, entry.key, entry.value)
         }
-        steps += FabricModJsonStep(project, buildSystem, config)
-        return steps
     }
 }
 
@@ -297,10 +299,10 @@ class CreateEntryPointStep(
                 JavaDirectoryService.getInstance().createClass(psiDir, className)
             } catch (e: IncorrectOperationException) {
                 invokeLater {
-                    val message = "${CodeInsightBundle.message(
+                    val message = CodeInsightBundle.message(
                         "intention.error.cannot.create.class.message",
                         className
-                    )}\n${e.localizedMessage}"
+                    ) + '\n' + e.localizedMessage
                     Messages.showErrorDialog(
                         project,
                         message,
@@ -329,8 +331,7 @@ class CreateEntryPointStep(
                         (entryPoint.methodName ?: functionalMethod.name) to paramTypes
                     }
                     .entries
-                    .filter { it.key != null }
-                    .map { it.key!! to it.value }
+                    .mapNotNull { it.key?.let { k -> k to it.value } }
                     .sortedBy { it.first.first }
 
                 val elementFactory = JavaPsiFacade.getElementFactory(project)

src/main/kotlin/com/demonwav/mcdev/platform/fabric/creator/FabricProjectSettingsWizard.kt

@@ -22,7 +22,7 @@ import com.demonwav.mcdev.platform.fabric.util.FabricConstants
 import com.demonwav.mcdev.platform.forge.inspections.sideonly.Side
 import com.demonwav.mcdev.util.License
 import com.demonwav.mcdev.util.SemanticVersion
-import com.demonwav.mcdev.util.firstOfType
+import com.demonwav.mcdev.util.modUpdateStep
 import com.demonwav.mcdev.util.toPackageName
 import com.extracraftx.minecraft.templatemakerfabric.data.DataProvider
 import com.intellij.openapi.ui.ComboBox
@@ -135,13 +135,8 @@ class FabricProjectSettingsWizard(private val creator: MinecraftProjectCreator)
     }
 
     override fun updateStep() {
-        config = creator.configs.firstOfType()
-
-        val buildSystem = creator.buildSystem ?: return
-
-        modNameField.text = WordUtils.capitalize(buildSystem.artifactId.replace('-', ' '))
-
-        val conf = config ?: return
+        val (conf, buildSystem) = modUpdateStep<FabricProjectConfig>(creator, modNameField) ?: return
+        config = conf
 
         if (creator.configs.indexOf(conf) != 0) {
             modNameField.isEditable = false
@@ -354,7 +349,7 @@ class FabricProjectSettingsWizard(private val creator: MinecraftProjectCreator)
 
         override fun getColumnCount() = 5
 
-        override fun getValueAt(row: Int, col: Int) = when (col) {
+        override fun getValueAt(row: Int, col: Int): Any? = when (col) {
             0 -> entryPoints[row].category
             1 -> entryPoints[row].type
             2 -> entryPoints[row].className

src/main/kotlin/com/demonwav/mcdev/platform/forge/creator/ForgeProjectSettingsWizard.kt

@@ -22,7 +22,7 @@ import com.demonwav.mcdev.platform.forge.version.ForgeVersion
 import com.demonwav.mcdev.platform.mcp.version.McpVersion
 import com.demonwav.mcdev.platform.mcp.version.McpVersionEntry
 import com.demonwav.mcdev.util.SemanticVersion
-import com.demonwav.mcdev.util.firstOfType
+import com.demonwav.mcdev.util.modUpdateStep
 import com.intellij.ui.CollectionComboBoxModel
 import java.awt.event.ActionListener
 import javax.swing.JComboBox
@@ -39,7 +39,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.swing.Swing
-import org.apache.commons.lang.WordUtils
 
 class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) : MinecraftModuleWizardStep() {
 
@@ -98,13 +97,8 @@ class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) :
     }
 
     override fun updateStep() {
-        config = creator.configs.firstOfType()
-
-        val buildSystem = creator.buildSystem ?: return
-
-        modNameField.text = WordUtils.capitalize(buildSystem.artifactId.replace('-', ' '))
-
-        val conf = config ?: return
+        val (conf, buildSystem) = modUpdateStep<ForgeProjectConfig>(creator, modNameField) ?: return
+        config = conf
 
         if (creator.configs.indexOf(conf) != 0) {
             modNameField.isEditable = false

src/main/kotlin/com/demonwav/mcdev/util/mod-creator.kt

@@ -0,0 +1,29 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2020 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.util
+
+import com.demonwav.mcdev.creator.MinecraftProjectCreator
+import com.demonwav.mcdev.creator.ProjectConfig
+import com.demonwav.mcdev.creator.buildsystem.BuildSystem
+import javax.swing.JTextField
+import org.apache.commons.lang.WordUtils
+
+inline fun <reified T : ProjectConfig> modUpdateStep(
+    creator: MinecraftProjectCreator,
+    modNameField: JTextField
+): Pair<T, BuildSystem>? {
+    val buildSystem = creator.buildSystem ?: return null
+
+    modNameField.text = WordUtils.capitalize(buildSystem.artifactId.replace('-', ' '))
+
+    val config = creator.configs.firstOfType<T>() ?: return null
+    return config to buildSystem
+}

src/test/kotlin/com/demonwav/mcdev/framework/test-util.kt

@@ -9,6 +9,7 @@
  */
 
 @file:JvmName("TestUtil")
+
 package com.demonwav.mcdev.framework
 
 import com.intellij.lexer.Lexer