Merge branch '2022.2' into 2022.3

Author: RedNesto

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2022.3
 ideaVersionName = 2022.3
 
-coreVersion = 1.6.3
+coreVersion = 1.6.4
 downloadIdeaSources = true
 
 pluginTomlVersion = 223.7571.59

readme.md

@@ -31,7 +31,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.6.3-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.6.4-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/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy

@@ -52,8 +52,15 @@ class FabricLoomModelBuilderImpl implements ModelBuilderService {
             decompilers << ["single": getDecompilers(loomExtension, false)]
         }
 
+        def modSourceSets = [:]
+
+        for (def mod in loomExtension.getMods()) {
+            def modName = mod.getName()
+            modSourceSets[modName] = mod.getModSourceSets().getOrNull()?.collect { it.sourceSet().getName() }
+        }
+
         //noinspection GroovyAssignabilityCheck
-        return new FabricLoomModelImpl(tinyMappings, decompilers, splitMinecraftJar)
+        return new FabricLoomModelImpl(tinyMappings, decompilers, splitMinecraftJar, modSourceSets)
     }
 
     List<FabricLoomModelImpl.DecompilerModelImpl> getDecompilers(Object loomExtension, boolean client) {
@@ -73,7 +80,7 @@ class FabricLoomModelBuilderImpl implements ModelBuilderService {
         }
 
         //noinspection GroovyAssignabilityCheck
-        return new FabricLoomModelImpl(tinyMappings, ["single": decompilers], false)
+        return new FabricLoomModelImpl(tinyMappings, ["single": decompilers], false, [:])
     }
 
     @Override

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy

@@ -17,6 +17,7 @@ class FabricLoomModelImpl implements FabricLoomModel, Serializable {
     File tinyMappings
     Map<String, List<DecompilerModel>> decompilers
     boolean splitMinecraftJar
+    Map<String, List<String>> modSourceSets
 
     @Immutable
     static class DecompilerModelImpl implements DecompilerModel, Serializable {

src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModel.java

@@ -22,6 +22,8 @@ public interface FabricLoomModel {
 
     boolean getSplitMinecraftJar();
 
+    Map<String, List<String>> getModSourceSets();
+
     interface DecompilerModel {
 
         String getName();

src/main/kotlin/asset/PlatformAssets.kt

@@ -47,9 +47,6 @@ object PlatformAssets : Assets() {
     val VELOCITY_ICON = loadIcon("/assets/icons/platform/Velocity.png")
     val VELOCITY_ICON_2X = loadIcon("/assets/icons/platform/[email protected]")
 
-    val LITELOADER_ICON = loadIcon("/assets/icons/platform/LiteLoader.png")
-    val LITELOADER_ICON_2X = loadIcon("/assets/icons/platform/[email protected]")
-
     val MIXIN_ICON = loadIcon("/assets/icons/platform/Mixins.png")
     val MIXIN_ICON_2X = loadIcon("/assets/icons/platform/[email protected]")
     val MIXIN_ICON_DARK = loadIcon("/assets/icons/platform/Mixins_dark.png")

src/main/kotlin/creator/buildsystem/gradle-steps.kt

@@ -20,7 +20,7 @@ import com.demonwav.mcdev.util.SemanticVersion
 import com.demonwav.mcdev.util.invokeAndWait
 import com.demonwav.mcdev.util.invokeLater
 import com.demonwav.mcdev.util.mapFirstNotNull
-import com.demonwav.mcdev.util.runGradleTaskAndWait
+import com.demonwav.mcdev.util.runGradleTask
 import com.demonwav.mcdev.util.runWriteAction
 import com.demonwav.mcdev.util.runWriteTask
 import com.demonwav.mcdev.util.virtualFileOrError
@@ -31,6 +31,7 @@ import com.intellij.lang.properties.psi.PropertiesFile
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.impl.NonProjectFileWritingAccessProvider
+import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupManager
 import com.intellij.openapi.util.Key
@@ -48,7 +49,7 @@ import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration
 import org.jetbrains.plugins.gradle.service.project.open.canLinkAndRefreshGradleProject
 import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradleProject
 
-val DEFAULT_GRADLE_VERSION = SemanticVersion.release(7, 3, 3)
+val DEFAULT_GRADLE_VERSION = SemanticVersion.release(7, 6, 1)
 val GRADLE_VERSION_KEY = Key.create<SemanticVersion>("mcdev.gradleVersion")
 
 fun FixedAssetsNewProjectWizardStep.addGradleWrapperProperties(project: Project) {
@@ -63,8 +64,10 @@ abstract class AbstractRunGradleTaskStep(parent: NewProjectWizardStep) : Abstrac
 
     override fun perform(project: Project) {
         val outputDirectory = context.projectFileDirectory
-        runGradleTaskAndWait(project, Path.of(outputDirectory)) { settings ->
-            settings.taskNames = listOf(task)
+        DumbService.getInstance(project).runWhenSmart {
+            runGradleTask(project, Path.of(outputDirectory)) { settings ->
+                settings.taskNames = listOf(task)
+            }
         }
     }
 }

src/main/kotlin/creator/buildsystem/maven-steps.kt

@@ -140,6 +140,7 @@ abstract class AbstractPatchPomStep(parent: NewProjectWizardStep) : AbstractLong
                         // The maven importer requires that the document is saved to disk
                         val document = PsiDocumentManager.getInstance(project).getDocument(pomPsi)
                             ?: return@runWriteAction
+                        PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document)
                         FileDocumentManager.getInstance().saveDocument(document)
                     }
                 }

src/main/kotlin/creator/step/AbstractReformatFilesStep.kt

@@ -10,11 +10,11 @@
 
 package com.demonwav.mcdev.creator.step
 
-import com.demonwav.mcdev.util.runWriteTask
 import com.intellij.codeInsight.actions.ReformatCodeProcessor
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.fileEditor.impl.NonProjectFileWritingAccessProvider
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.psi.PsiFile
@@ -44,7 +44,7 @@ abstract class AbstractReformatFilesStep(parent: NewProjectWizardStep) : Abstrac
         }
         files.ifEmpty { return }
 
-        runWriteTask {
+        NonProjectFileWritingAccessProvider.disableChecksDuring {
             WriteCommandAction.writeCommandAction(project, *files).withGlobalUndo().run<Throwable> {
                 ReformatCodeProcessor(project, files, null, false).run()
             }

src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt

@@ -72,6 +72,10 @@ abstract class FixedAssetsNewProjectWizardStep(parent: NewProjectWizardStep) : A
         setupAssets(project)
 
         WriteAction.runAndWait<Throwable> {
+            if (project.isDisposed) {
+                return@runAndWait
+            }
+
             val generatedFiles = mutableSetOf<VirtualFile>()
             for (asset in assets) {
                 generateFile(asset)?.let { generatedFiles += it }
@@ -86,7 +90,7 @@ abstract class FixedAssetsNewProjectWizardStep(parent: NewProjectWizardStep) : A
     fun runWhenCreated(project: Project, action: () -> Unit) {
         if (ApplicationManager.getApplication().isUnitTestMode) {
             action()
-        } else {
+        } else if (!project.isDisposed) {
             StartupManager.getInstance(project).runAfterOpened {
                 ApplicationManager.getApplication().invokeLater(action, project.disposed)
             }