Merge branch '2024.1' into 2024.2

Author: RedNesto

readme.md

@@ -11,14 +11,6 @@ Minecraft Development for IntelliJ
         <td align="right"><b>Main Build</b></td>
         <td colspan="2"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Build"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Build)/statusIcon.svg" alt="Teamcity Build Status" /></a></td>
     </tr>
-    <tr>
-        <td align="left">2023.2</td>
-        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20232"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20232)/statusIcon.svg" alt="2023.2 Nightly Status" /></a></td>
-    </tr>
-    <tr>
-        <td align="left">2023.3</td>
-        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20233"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20233)/statusIcon.svg" alt="2023.3 Nightly Status" /></a></td>
-    </tr>
     <tr>
         <td align="left">2024.1</td>
         <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20241"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20241)/statusIcon.svg" alt="2024.1 Nightly Status" /></a></td>
@@ -27,6 +19,10 @@ Minecraft Development for IntelliJ
         <td align="left">2024.2</td>
         <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20242"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20242)/statusIcon.svg" alt="2024.2 Nightly Status" /></a></td>
     </tr>
+    <tr>
+        <td align="left">2024.3</td>
+        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20243"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20243)/statusIcon.svg" alt="2024.3 Nightly Status" /></a></td>
+    </tr>
     <tr>
         <td align="right"><b>OS Tests</b></td>
         <td align="left" colspan="2">
@@ -35,7 +31,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.1-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

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

@@ -21,7 +21,6 @@
 package com.demonwav.mcdev.creator.custom
 
 import com.demonwav.mcdev.asset.MCDevBundle
-import com.demonwav.mcdev.asset.MCDevBundle.invoke
 import com.demonwav.mcdev.creator.custom.finalizers.CreatorFinalizer
 import com.demonwav.mcdev.creator.custom.providers.EmptyLoadedTemplate
 import com.demonwav.mcdev.creator.custom.providers.LoadedTemplate
@@ -55,12 +54,10 @@ import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.application
 import java.nio.file.Path
 import java.util.function.Consumer
-import kotlin.collections.mapNotNull
-import kotlin.collections.orEmpty
-import kotlin.collections.set
 import kotlin.io.path.createDirectories
 import kotlin.io.path.writeText
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 interface ExternalTemplatePropertyProvider {
 
@@ -286,7 +283,7 @@ class CreatorTemplateProcessor(
             }
         }
 
-        val finalizeAction = {
+        val finalizeAction = suspend {
             WriteAction.runAndWait<Throwable> {
                 LocalFileSystem.getInstance().refresh(false)
                 // Apparently a module root is required for the reformat to work
@@ -304,7 +301,7 @@ class CreatorTemplateProcessor(
         if (context.wizardContext.isCreatingNewProject) {
             TemplateService.instance.registerFinalizerAction(project, finalizeAction)
         } else {
-            application.executeOnPooledThread { finalizeAction() }
+            context.scope.launch { finalizeAction() }
         }
     }
 

src/main/kotlin/creator/custom/finalizers/CreatorFinalizer.kt

@@ -38,7 +38,7 @@ interface CreatorFinalizer {
 
     fun validate(reporter: TemplateValidationReporter, properties: Map<String, Any>) = Unit
 
-    fun execute(
+    suspend fun execute(
         context: WizardContext,
         project: Project,
         properties: Map<String, Any>,
@@ -83,7 +83,7 @@ interface CreatorFinalizer {
             }
         }
 
-        fun executeAll(
+        suspend fun executeAll(
             context: WizardContext,
             project: Project,
             finalizers: List<Map<String, Any>>,

src/main/kotlin/creator/custom/finalizers/GitAddAllFinalizer.kt

@@ -27,7 +27,7 @@ import com.intellij.openapi.project.Project
 
 class GitAddAllFinalizer : CreatorFinalizer {
 
-    override fun execute(
+    override suspend fun execute(
         context: WizardContext,
         project: Project,
         properties: Map<String, Any>,

src/main/kotlin/creator/custom/finalizers/ImportGradleProjectFinalizer.kt

@@ -28,7 +28,7 @@ import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradlePro
 
 class ImportGradleProjectFinalizer : CreatorFinalizer {
 
-    override fun execute(
+    override suspend fun execute(
         context: WizardContext,
         project: Project,
         properties: Map<String, Any>,

src/main/kotlin/creator/custom/finalizers/ImportMavenProjectFinalizer.kt

@@ -25,13 +25,12 @@ import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
 import java.nio.file.Path
-import kotlinx.coroutines.runBlocking
 import org.jetbrains.idea.maven.buildtool.MavenSyncSpec
 import org.jetbrains.idea.maven.project.MavenProjectsManager
 
 class ImportMavenProjectFinalizer : CreatorFinalizer {
 
-    override fun execute(
+    override suspend fun execute(
         context: WizardContext,
         project: Project,
         properties: Map<String, Any>,
@@ -44,9 +43,7 @@ class ImportMavenProjectFinalizer : CreatorFinalizer {
         thisLogger().info("Invoking import on EDT pomFile = ${pomFile.path}")
         val projectsManager = MavenProjectsManager.getInstance(project)
         projectsManager.addManagedFiles(listOf(pomFile))
-        runBlocking {
-            projectsManager.updateAllMavenProjects(MavenSyncSpec.incremental("ImportMavenProjectFinalizer", false))
-        }
+        projectsManager.updateAllMavenProjects(MavenSyncSpec.incremental("ImportMavenProjectFinalizer", false))
 
         thisLogger().info("Import finished")
     }

src/main/kotlin/creator/custom/finalizers/RunGradleTasksFinalizer.kt

@@ -39,7 +39,7 @@ class RunGradleTasksFinalizer : CreatorFinalizer {
         }
     }
 
-    override fun execute(
+    override suspend fun execute(
         context: WizardContext,
         project: Project,
         properties: Map<String, Any>,