User: rednesto
Date: 19 Mar 23 19:44
Revision: dd2af56b9d7d8663e75b4c90d9ce665df9303e2c
Summary:
Merge branch '2022.3' into 2023.1

# Conflicts:
#	readme.md
#	src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8398&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 44661fb8f7b5efc438f462d3be2eb016aa1c3c7f)
+++ build.gradle.kts	(revision dd2af56b9d7d8663e75b4c90d9ce665df9303e2c)
@@ -23,7 +23,7 @@
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.13.0"
+    id("org.jetbrains.intellij") version "1.13.2"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 44661fb8f7b5efc438f462d3be2eb016aa1c3c7f)
+++ gradle.properties	(revision dd2af56b9d7d8663e75b4c90d9ce665df9303e2c)
@@ -14,7 +14,7 @@
 ideaVersion = 231.8109-EAP-CANDIDATE-SNAPSHOT
 ideaVersionName = 2023.1
 
-coreVersion = 1.6.1
+coreVersion = 1.6.2
 downloadIdeaSources = true
 
 pluginTomlVersion = 231.8109.1
Index: src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt
===================================================================
--- src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision 44661fb8f7b5efc438f462d3be2eb016aa1c3c7f)
+++ src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision dd2af56b9d7d8663e75b4c90d9ce665df9303e2c)
@@ -11,6 +11,7 @@
 package com.demonwav.mcdev.creator
 
 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
 import com.intellij.ide.wizard.NewProjectWizardStep
@@ -43,6 +44,19 @@
         }
         result
     }
+    private val step by lazy {
+        when (finalizers.size) {
+            0 -> null
+            1 -> finalizers[0]
+            else -> {
+                var step = finalizers[0].nextStep { finalizers[1] }
+                for (i in 2 until finalizers.size) {
+                    step = step.nextStep { finalizers[i] }
+                }
+                step
+            }
+        }
+    }
 
     override fun setupUI(builder: Panel) {
         for (step in finalizers) {