User: joe
Date: 01 Mar 23 13:33
Revision: 767b00553a60962bff8fb8e12354e8907b0df7de
Summary:
Merge branch '2022.2' into 2022.3


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8346&personal=false

Index: src/main/kotlin/platform/architectury/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision 6ca53333e8fe6494dc723942d7422b66ae6972d4)
+++ src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision 767b00553a60962bff8fb8e12354e8907b0df7de)
@@ -10,7 +10,6 @@
 
 package com.demonwav.mcdev.platform.architectury.creator
 
-import com.demonwav.mcdev.creator.chain
 import com.demonwav.mcdev.creator.platformtype.ModPlatformStep
 import com.demonwav.mcdev.creator.step.AbstractCollapsibleStep
 import com.demonwav.mcdev.creator.step.AbstractLatentStep
@@ -20,6 +19,7 @@
 import com.demonwav.mcdev.creator.step.IssueTrackerStep
 import com.demonwav.mcdev.creator.step.LicenseStep
 import com.demonwav.mcdev.creator.step.ModNameStep
+import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.RepositoryStep
 import com.demonwav.mcdev.creator.step.UseMixinsStep
 import com.demonwav.mcdev.creator.step.WebsiteStep
@@ -31,7 +31,6 @@
 import com.demonwav.mcdev.util.asyncIO
 import com.demonwav.mcdev.util.bindEnabled
 import com.intellij.ide.wizard.NewProjectWizardStep
-import com.intellij.ide.wizard.chain
 import com.intellij.openapi.observable.util.bindBooleanStorage
 import com.intellij.openapi.observable.util.transform
 import com.intellij.openapi.project.Project
@@ -63,18 +62,17 @@
     }
 
     override fun createStep(data: ArchitecturyVersionData): NewProjectWizardStep {
-        return ArchitecturyVersionChainStep(this, data).chain(
-            ::UseMixinsStep,
-            ::ModNameStep,
-            ::LicenseStep,
-            ::ArchitecturyOptionalSettingsStep,
-            ::ArchitecturyBuildSystemStep,
-            ::ArchitecturyProjectFilesStep,
-            ::ArchitecturyCommonMainClassStep,
-            ::ArchitecturyForgeMainClassStep,
-            ::ArchitecturyFabricMainClassStep,
-            ::ArchitecturyPostBuildSystemStep,
-        )
+        return ArchitecturyVersionChainStep(this, data)
+            .nextStep(::UseMixinsStep)
+            .nextStep(::ModNameStep)
+            .nextStep(::LicenseStep)
+            .nextStep(::ArchitecturyOptionalSettingsStep)
+            .nextStep(::ArchitecturyBuildSystemStep)
+            .nextStep(::ArchitecturyProjectFilesStep)
+            .nextStep(::ArchitecturyCommonMainClassStep)
+            .nextStep(::ArchitecturyForgeMainClassStep)
+            .nextStep(::ArchitecturyFabricMainClassStep)
+            .nextStep(::ArchitecturyPostBuildSystemStep)
     }
 
     class Factory : ModPlatformStep.Factory {
@@ -193,10 +191,9 @@
 class ArchitecturyOptionalSettingsStep(parent: NewProjectWizardStep) : AbstractCollapsibleStep(parent) {
     override val title = "Optional Settings"
 
-    override fun createStep() = DescriptionStep(this).chain(
-        ::AuthorsStep,
-        ::WebsiteStep,
-        ::RepositoryStep,
-        ::IssueTrackerStep,
-    )
+    override fun createStep() = DescriptionStep(this)
+        .nextStep(::AuthorsStep)
+        .nextStep(::WebsiteStep)
+        .nextStep(::RepositoryStep)
+        .nextStep(::IssueTrackerStep)
 }
Index: src/main/kotlin/platform/fabric/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/fabric/creator/ui-steps.kt	(revision 6ca53333e8fe6494dc723942d7422b66ae6972d4)
+++ src/main/kotlin/platform/fabric/creator/ui-steps.kt	(revision 767b00553a60962bff8fb8e12354e8907b0df7de)
@@ -10,7 +10,6 @@
 
 package com.demonwav.mcdev.platform.fabric.creator
 
-import com.demonwav.mcdev.creator.chain
 import com.demonwav.mcdev.creator.platformtype.ModPlatformStep
 import com.demonwav.mcdev.creator.step.AbstractCollapsibleStep
 import com.demonwav.mcdev.creator.step.AbstractLatentStep
@@ -19,6 +18,7 @@
 import com.demonwav.mcdev.creator.step.DescriptionStep
 import com.demonwav.mcdev.creator.step.LicenseStep
 import com.demonwav.mcdev.creator.step.ModNameStep
+import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.RepositoryStep
 import com.demonwav.mcdev.creator.step.UseMixinsStep
 import com.demonwav.mcdev.creator.step.WaitForSmartModeStep
@@ -31,7 +31,6 @@
 import com.demonwav.mcdev.util.bindEnabled
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
 import com.intellij.ide.wizard.NewProjectWizardStep
-import com.intellij.ide.wizard.chain
 import com.intellij.openapi.observable.util.bindBooleanStorage
 import com.intellij.openapi.observable.util.bindStorage
 import com.intellij.openapi.observable.util.transform
@@ -62,18 +61,16 @@
     override fun createStep(data: Pair<FabricVersions, FabricApiVersions>): NewProjectWizardStep {
         val (fabricVersions, apiVersions) = data
         return FabricVersionChainStep(this, fabricVersions, apiVersions)
-            .chain(
-                ::FabricEnvironmentStep,
-                ::UseMixinsStep,
-                ::ModNameStep,
-                ::LicenseStep,
-                ::FabricOptionalSettingsStep,
-                ::FabricBuildSystemStep,
-                ::FabricDumbModeFilesStep,
-                ::FabricPostBuildSystemStep,
-                ::WaitForSmartModeStep,
-                ::FabricSmartModeFilesStep,
-            )
+            .nextStep(::FabricEnvironmentStep)
+            .nextStep(::UseMixinsStep)
+            .nextStep(::ModNameStep)
+            .nextStep(::LicenseStep)
+            .nextStep(::FabricOptionalSettingsStep)
+            .nextStep(::FabricBuildSystemStep)
+            .nextStep(::FabricDumbModeFilesStep)
+            .nextStep(::FabricPostBuildSystemStep)
+            .nextStep(::WaitForSmartModeStep)
+            .nextStep(::FabricSmartModeFilesStep)
     }
 
     class Factory : ModPlatformStep.Factory {
@@ -252,9 +249,8 @@
 class FabricOptionalSettingsStep(parent: NewProjectWizardStep) : AbstractCollapsibleStep(parent) {
     override val title = "Optional Settings"
 
-    override fun createStep() = DescriptionStep(this).chain(
-        ::AuthorsStep,
-        ::WebsiteStep,
-        ::RepositoryStep,
-    )
+    override fun createStep() = DescriptionStep(this)
+        .nextStep(::AuthorsStep)
+        .nextStep(::WebsiteStep)
+        .nextStep(::RepositoryStep)
 }