Merge branch '2023.1' into 2023.2

Author: RedNesto

build.gradle.kts

@@ -285,6 +285,7 @@ license {
     style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
 
     val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
+    exclude("META-INF/plugin.xml") // https://youtrack.jetbrains.com/issue/IDEA-345026
     include(endings.map { "**/*.$it" })
 
     exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java")

gradle.properties

@@ -24,7 +24,7 @@ kotlin.code.style=official
 ideaVersion = 2023.2.2
 ideaVersionName = 2023.2.2
 
-coreVersion = 1.7.1
+coreVersion = 1.7.2
 downloadIdeaSources = true
 
 pluginTomlVersion = 232.8660.88

src/main/kotlin/creator/MinecraftModuleBuilder.kt

@@ -26,7 +26,6 @@ import com.demonwav.mcdev.creator.buildsystem.BuildSystemPropertiesStep
 import com.demonwav.mcdev.creator.platformtype.PlatformTypeStep
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.TemplateOutdatedStep
-import com.demonwav.mcdev.platform.MinecraftModuleType
 import com.intellij.ide.projectWizard.ProjectSettingsStep
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.ide.wizard.AbstractNewProjectWizardBuilder
@@ -37,9 +36,9 @@ import com.intellij.openapi.roots.ModifiableRootModel
 
 class MinecraftModuleBuilder : AbstractNewProjectWizardBuilder() {
 
-    override fun getPresentableName() = MinecraftModuleType.NAME
+    override fun getPresentableName() = "Minecraft"
     override fun getNodeIcon() = PlatformAssets.MINECRAFT_ICON
-    override fun getGroupName() = MinecraftModuleType.NAME
+    override fun getGroupName() = "Minecraft"
     override fun getBuilderId() = "MINECRAFT_MODULE"
     override fun getDescription() = MCDevBundle("creator.ui.create_minecraft_project")
 
@@ -51,7 +50,7 @@ class MinecraftModuleBuilder : AbstractNewProjectWizardBuilder() {
         }
     }
 
-    override fun getParentGroup() = MinecraftModuleType.NAME
+    override fun getParentGroup() = "Minecraft"
 
     override fun createStep(context: WizardContext) = RootNewProjectWizardStep(context)
         .nextStep(::NewProjectWizardBaseStep)

src/main/kotlin/facet/MinecraftFacet.kt

@@ -27,7 +27,6 @@ import com.demonwav.mcdev.platform.AbstractModuleType
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.util.SourceType
 import com.demonwav.mcdev.util.filterNotNull
-import com.demonwav.mcdev.util.invokeAndWait
 import com.demonwav.mcdev.util.mapFirstNotNull
 import com.google.common.collect.HashMultimap
 import com.intellij.facet.Facet
@@ -36,6 +35,8 @@ import com.intellij.facet.FacetTypeId
 import com.intellij.facet.FacetTypeRegistry
 import com.intellij.ide.projectView.ProjectView
 import com.intellij.openapi.application.runReadAction
+import com.intellij.openapi.application.runWriteAction
+import com.intellij.openapi.application.runWriteActionAndWait
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleGrouper
 import com.intellij.openapi.module.ModuleManager
@@ -75,9 +76,9 @@ class MinecraftFacet(
         roots.clear()
     }
 
-    fun refresh() {
+    fun refresh() = runWriteActionAndWait {
         if (module.isDisposed) {
-            return
+            return@runWriteActionAndWait
         }
 
         // Don't allow parent types with child types in auto detected set
@@ -120,14 +121,13 @@ class MinecraftFacet(
         ProjectView.getInstance(module.project).refresh()
     }
 
-    private fun updateRoots() = invokeAndWait {
+    private fun updateRoots() = runWriteAction {
         if (module.isDisposed) {
-            return@invokeAndWait
+            return@runWriteAction
         }
 
         roots.clear()
         val rootManager = ModuleRootManager.getInstance(module)
-
         rootManager.contentEntries.asSequence()
             .flatMap { entry -> entry.sourceFolders.asSequence() }
             .filterNotNull { it.file }

src/main/kotlin/facet/MinecraftFacetDetector.kt

@@ -41,11 +41,11 @@ import com.intellij.openapi.roots.libraries.LibraryDetectionManager
 import com.intellij.openapi.roots.libraries.LibraryKind
 import com.intellij.openapi.roots.libraries.LibraryProperties
 import com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 import com.intellij.openapi.util.Key
 import org.jetbrains.plugins.gradle.util.GradleUtil
 
-class MinecraftFacetDetector : StartupActivity {
+class MinecraftFacetDetector : ProjectActivity {
     companion object {
         private val libraryVersionsKey = Key<MutableMap<LibraryKind, String>>("mcdev.libraryVersions")
 
@@ -54,7 +54,7 @@ class MinecraftFacetDetector : StartupActivity {
         }
     }
 
-    override fun runActivity(project: Project) {
+    override suspend fun execute(project: Project) {
         MinecraftModuleRootListener.doCheck(project)
     }
 

src/main/kotlin/facet/ProjectReimporter.kt

@@ -20,6 +20,9 @@
 
 package com.demonwav.mcdev.facet
 
+import com.demonwav.mcdev.asset.MCDevBundle
+import com.intellij.notification.Notification
+import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.diagnostic.logger
@@ -57,7 +60,23 @@ object ProjectReimporter {
             true
         )
         callback.doWhenRejected { error ->
-            log.error("Rejected refresh all projects: $error")
+            if (error == null) {
+                Notification(
+                    "Minecraft facet",
+                    MCDevBundle("facet.reimport.failed.title"),
+                    MCDevBundle("facet.reimport.failed.content.no_error"),
+                    NotificationType.WARNING
+                ).notify(project)
+                log.warn("Rejected refresh all projects, no details provided")
+            } else {
+                Notification(
+                    "Minecraft facet",
+                    MCDevBundle("facet.reimport.failed.title"),
+                    MCDevBundle("facet.reimport.failed.content.with_error", error),
+                    NotificationType.WARNING
+                ).notify(project)
+                log.error("Rejected refresh all projects: $error")
+            }
         }
     }
 }

src/main/kotlin/platform/MinecraftModuleType.kt

@@ -41,6 +41,7 @@ import com.demonwav.mcdev.creator.step.LicenseStep
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.UseMixinsStep
 import com.demonwav.mcdev.util.MinecraftTemplates
+import com.demonwav.mcdev.util.MinecraftVersions
 import com.demonwav.mcdev.util.SemanticVersion
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.application.WriteAction
@@ -102,6 +103,7 @@ class ForgeGradleFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningAs
             "AUTHOR_LIST" to authors.joinToString(", "),
             "LICENSE" to license.id,
             "HAS_DATA" to "true",
+            "MERGE_RESOURCES_AND_CLASSES" to (mcVersion >= MinecraftVersions.MC1_20_3),
         )
 
         if (javaVersion != null) {

src/main/kotlin/platform/forge/creator/gradle-steps.kt

@@ -37,6 +37,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIdentifier
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiReference
+import com.intellij.psi.util.createSmartPointer
 import com.intellij.ui.LightColors
 import com.intellij.ui.awt.RelativePoint
 import java.awt.Point
@@ -88,9 +89,10 @@ abstract class SrgActionBase : AnAction() {
 
             val project = e.project ?: return
 
+            val elementPointer = getDataFromActionEvent(e)?.element?.createSmartPointer()
+            val editor = getDataFromActionEvent(e)?.editor
             invokeLater {
-                val element = getDataFromActionEvent(e)?.element
-                val editor = getDataFromActionEvent(e)?.editor
+                val element = elementPointer?.element
                 if (element != null && editor != null) {
                     val pos = editor.offsetToVisualPosition(element.textRange.endOffset - element.textLength / 2)
                     val at = RelativePoint(

src/main/kotlin/platform/mcp/actions/SrgActionBase.kt

@@ -219,11 +219,30 @@ class NewInsnSelectorParser : MixinSelectorParser {
         if (!at.hasQualifiedName(AT)) return null
         if (at.findAttributeValue("value")?.constantStringValue != "NEW") return null
 
-        return NewInsnSelector(value)
+        val strippedValue = value.replace(" ", "")
+        return if (strippedValue.startsWith('(')) {
+            NewInsnDescriptorSelector(strippedValue)
+        } else {
+            NewInsnTypeSelector(strippedValue)
+        }
     }
 }
 
-private class NewInsnSelector(
+private class NewInsnTypeSelector(
+    override val owner: String,
+) : MixinSelector {
+    override fun matchField(owner: String, name: String, desc: String) = false
+
+    override fun matchMethod(owner: String, name: String, desc: String): Boolean {
+        return name == "<init>" && owner == this.owner
+    }
+
+    override val fieldDescriptor = null
+    override val methodDescriptor = null
+    override val displayName = owner
+}
+
+private class NewInsnDescriptorSelector(
     override val methodDescriptor: String,
 ) : MixinSelector {
     override fun matchField(owner: String, name: String, desc: String): Boolean = false