User: rednesto Date: 16 Jul 23 21:02 Revision: 4f50727d173e282aff36c270ae007eae03b12b8d Summary: Merge branch '2023.1' into 2023.2 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8657&personal=false Index: gradle.properties =================================================================== --- gradle.properties (revision 51bf6c5f19480ae08a1d1f2cb3ae93e952fb0d4f) +++ gradle.properties (revision 4f50727d173e282aff36c270ae007eae03b12b8d) @@ -24,7 +24,7 @@ ideaVersion = 232.8453.116-EAP-SNAPSHOT ideaVersionName = 2023.2 -coreVersion = 1.6.7 +coreVersion = 1.6.8 downloadIdeaSources = true pluginTomlVersion = 232.8453.111 Index: src/main/kotlin/creator/buildsystem/maven-steps.kt =================================================================== --- src/main/kotlin/creator/buildsystem/maven-steps.kt (revision 51bf6c5f19480ae08a1d1f2cb3ae93e952fb0d4f) +++ src/main/kotlin/creator/buildsystem/maven-steps.kt (revision 4f50727d173e282aff36c270ae007eae03b12b8d) @@ -22,6 +22,7 @@ import com.demonwav.mcdev.creator.findStep import com.demonwav.mcdev.creator.getVersionJson +import com.demonwav.mcdev.creator.notifyCreatedProjectNotOpened import com.demonwav.mcdev.creator.step.AbstractLongRunningStep import com.demonwav.mcdev.creator.step.AbstractModNameStep import com.demonwav.mcdev.creator.step.AbstractReformatFilesStep @@ -126,7 +127,8 @@ override fun perform(project: Project) { invokeAndWait { - if (project.isDisposed) { + if (project.isDisposed || !project.isInitialized) { + notifyCreatedProjectNotOpened() return@invokeAndWait } @@ -173,7 +175,8 @@ val pomFile = VfsUtil.findFile(Path.of(context.projectFileDirectory).resolve("pom.xml"), true) ?: return val promise = invokeAndWait { - if (project.isDisposed) { + if (project.isDisposed || !project.isInitialized) { + notifyCreatedProjectNotOpened() return@invokeAndWait null } MavenImportingManager.getInstance(project).linkAndImportFile(pomFile)