Merge branch '2025.2' into 2025.3

Earthcomputer · Earthcomputer · commit ef4e867525a3 · 2026-04-06T17:54:48.000+01:00
diff --git a/readme.md b/readme.md
@@ -19,6 +19,10 @@ Minecraft Development for IntelliJ
         <td align="left">2025.3</td>
         <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20253"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20253)/statusIcon.svg" alt="2025.3 Nightly Status" /></a></td>
     </tr>
+    <tr>
+        <td align="left">2026.1</td>
+        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20261"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20261)/statusIcon.svg" alt="2026.1 Nightly Status" /></a></td>
+    </tr>
     <tr>
         <td align="left"><b>OS Tests</b></td>
         <td align="left" colspan="2">
diff --git a/src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy b/src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy
@@ -51,7 +51,14 @@ final class NeoModDevGradleModelBuilderImpl implements ModelBuilderService {
 
         def neoFormVersion
         try {
-            neoFormVersion = extension.neoFormVersion.getOrNull()
+            def neoFormVersionProp = extension.neoFormVersion
+            if (neoFormVersionProp instanceof String) {
+                neoFormVersion = neoFormVersionProp
+            } else if (neoFormVersionProp instanceof Provider) {
+                neoFormVersion = neoFormVersionProp.getOrNull()
+            } else {
+                neoFormVersion = null
+            }
         } catch (InvalidUserCodeException ignore) {
             // Happens when the NeoForm version is not set
             neoFormVersion = null
diff --git a/src/main/grammars/CtLexer.flex b/src/main/grammars/CtLexer.flex
@@ -46,6 +46,8 @@ import static com.intellij.psi.TokenType.*;
 %s AW_TYPES
 %s ITF_ENTRY_KEY
 %s ITF_ENTRY_VALUE
+%s ENUM_NAME
+%s ENUM_VALUE
 %s SIGNATURE
 
 %unicode
@@ -59,6 +61,7 @@ SIGNATURE_CLASS_VALUE_START=L[^;<\n]+
 TYPE_VARIABLE=T[^;\n]+;
 ACCESS_ELEMENT=accessible|transitive-accessible|extendable|transitive-extendable|mutable|transitive-mutable
 INJECT_INTERFACE_ELEMENT=inject-interface|transitive-inject-interface
+EXTEND_ENUM_ELEMENT=extend-enum|transitive-extend-enum
 CLASS_ELEMENT=class
 METHOD_ELEMENT=method
 FIELD_ELEMENT=field
@@ -74,6 +77,7 @@ WHITE_SPACE=\s
     {HEADER_NAME}                               { yybegin(HEADER); return HEADER_NAME; }
     {ACCESS_ELEMENT}                            { yybegin(AW_ENTRY); return ACCESS_ELEMENT; }
     {INJECT_INTERFACE_ELEMENT}                  { yybegin(ITF_ENTRY_KEY); return INJECT_INTERFACE_ELEMENT; }
+    {EXTEND_ENUM_ELEMENT}                       { yybegin(ENUM_NAME); return EXTEND_ENUM_ELEMENT; }
 }
 
 <HEADER> {
@@ -111,6 +115,14 @@ WHITE_SPACE=\s
     {CLASS_NAME_ELEMENT}                        { yybegin(SIGNATURE); return CLASS_NAME_ELEMENT; }
 }
 
+<ENUM_NAME> {
+    {CLASS_NAME_ELEMENT}                        { yybegin(ENUM_VALUE); return CLASS_NAME_ELEMENT; }
+}
+
+<ENUM_VALUE> {
+    {NAME_ELEMENT}                              { return NAME_ELEMENT; }
+}
+
 <SIGNATURE> {
     "<"                                         { return LESS_THAN; }
     ">"                                         { return GREATER_THAN; }
diff --git a/src/main/grammars/CtParser.bnf b/src/main/grammars/CtParser.bnf
@@ -49,7 +49,7 @@ header ::= HEADER_NAME HEADER_VERSION_ELEMENT HEADER_NAMESPACE_ELEMENT {
     pin = 1
 }
 
-private entry ::= aw_entry | itf_entry {
+private entry ::= aw_entry | itf_entry | extend_enum_entry {
     mixin="com.demonwav.mcdev.platform.mcp.ct.psi.mixins.impl.CtEntryImplMixin"
     implements="com.demonwav.mcdev.platform.mcp.ct.psi.mixins.impl.CtEntryMixin"
     recoverWhile = line_recover
@@ -84,6 +84,12 @@ itf_entry ::= INJECT_INTERFACE_ELEMENT class_name signature {
     pin = 1
 }
 
+extend_enum_entry ::= EXTEND_ENUM_ELEMENT class_name member_name {
+    mixin="com.demonwav.mcdev.platform.mcp.ct.psi.mixins.impl.CtExtendEnumEntryImplMixin"
+    implements="com.demonwav.mcdev.platform.mcp.ct.psi.mixins.CtExtendEnumEntryMixin"
+    pin = 1
+}
+
 private line_recover ::= !(end_line | COMMENT)
 
 access ::= ACCESS_ELEMENT {
diff --git a/src/main/kotlin/facet/MinecraftFacet.kt b/src/main/kotlin/facet/MinecraftFacet.kt
@@ -35,6 +35,7 @@ import com.intellij.facet.FacetManager
 import com.intellij.facet.FacetTypeId
 import com.intellij.facet.FacetTypeRegistry
 import com.intellij.ide.projectView.ProjectView
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.module.Module
@@ -77,7 +78,15 @@ class MinecraftFacet(
         roots.clear()
     }
 
-    fun refresh() = runWriteActionAndWait {
+    fun refresh() {
+        refreshWritePhase()
+        // Refresh the project view separately to not hold the write lock
+        ApplicationManager.getApplication().invokeLater {
+            ProjectView.getInstance(module.project).refresh()
+        }
+    }
+
+    private fun refreshWritePhase() = runWriteActionAndWait {
         if (module.isDisposed) {
             return@runWriteActionAndWait
         }
@@ -118,8 +127,6 @@ class MinecraftFacet(
 
         newlyEnabled.forEach(AbstractModule::init)
         modules.forEach(AbstractModule::refresh)
-
-        ProjectView.getInstance(module.project).refresh()
     }
 
     private fun updateRoots() = runWriteAction {
diff --git a/src/main/kotlin/platform/mcp/McpModule.kt b/src/main/kotlin/platform/mcp/McpModule.kt
@@ -29,6 +29,7 @@ import com.demonwav.mcdev.platform.mcp.util.McpConstants
 import com.demonwav.mcdev.translations.TranslationFileListener
 import com.demonwav.mcdev.util.runWriteTaskLater
 import com.intellij.json.JsonFileType
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder
 import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
 import com.intellij.openapi.fileTypes.FileTypeManager
@@ -71,7 +72,10 @@ class McpModule(facet: MinecraftFacet) : AbstractModule(facet) {
             }
 
             if (requiresRefresh) {
-                ExternalSystemUtil.refreshProjects(ImportSpecBuilder(project, GradleConstants.SYSTEM_ID))
+                // Schedule Gradle project refresh outside write lock
+                ApplicationManager.getApplication().invokeLater {
+                    ExternalSystemUtil.refreshProjects(ImportSpecBuilder(project, GradleConstants.SYSTEM_ID))
+                }
             }
         }
     }
diff --git a/src/main/kotlin/platform/mcp/ct/CtAnnotator.kt b/src/main/kotlin/platform/mcp/ct/CtAnnotator.kt
@@ -22,8 +22,10 @@ package com.demonwav.mcdev.platform.mcp.ct
 
 import com.demonwav.mcdev.platform.mcp.ct.gen.psi.CtAccess
 import com.demonwav.mcdev.platform.mcp.ct.gen.psi.CtClassLiteral
+import com.demonwav.mcdev.platform.mcp.ct.gen.psi.CtExtendEnumEntry
 import com.demonwav.mcdev.platform.mcp.ct.gen.psi.CtFieldLiteral
 import com.demonwav.mcdev.platform.mcp.ct.gen.psi.CtHeader
+import com.demonwav.mcdev.platform.mcp.ct.gen.psi.CtItfEntry
 import com.demonwav.mcdev.platform.mcp.ct.gen.psi.CtMethodLiteral
 import com.demonwav.mcdev.util.childOfType
 import com.google.common.collect.HashMultimap
@@ -38,23 +40,40 @@ import com.intellij.psi.util.PsiTreeUtil
 class CtAnnotator : Annotator {
 
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
-        if (element is CtAccess) {
-            val access = element.text
-            val target = PsiTreeUtil.skipSiblingsForward(element, PsiWhiteSpace::class.java)?.text
-            if (!TokenSets.compatibleByAccessMap.get(access).contains(target)) {
-                holder.newAnnotation(HighlightSeverity.ERROR, "Access '$access' cannot be used on '$target'").create()
-            }
+        val effectiveVersion by lazy { element.containingFile?.childOfType<CtHeader>()?.effectiveVersion ?: 1 }
+
+        when (element) {
+            is CtAccess -> {
+                val access = element.text
+                val target = PsiTreeUtil.skipSiblingsForward(element, PsiWhiteSpace::class.java)?.text
+                if (!TokenSets.compatibleByAccessMap.get(access).contains(target)) {
+                    holder.newAnnotation(HighlightSeverity.ERROR, "Access '$access' cannot be used on '$target'").create()
+                }
 
-            if (element.accessElement.text.startsWith("transitive-") &&
-                element.containingFile?.childOfType<CtHeader>()?.effectiveVersion == 1
-            ) {
-                holder.newAnnotation(HighlightSeverity.ERROR, "Transitive accesses were introduced in v2").create()
+                if (element.accessElement.text.startsWith("transitive-") && effectiveVersion < 2) {
+                    holder.newAnnotation(HighlightSeverity.ERROR, "Transitive accesses were introduced in v2").create()
+                }
+            }
+            is CtItfEntry -> {
+                if (effectiveVersion < 3) {
+                    holder.newAnnotation(HighlightSeverity.ERROR, "Interface injection was introduced in ClassTweaker v1")
+                        .range(element.firstChild)
+                        .create()
+                }
+            }
+            is CtExtendEnumEntry -> {
+                if (effectiveVersion < 4) {
+                    holder.newAnnotation(HighlightSeverity.ERROR, "Enum extension was introduced in ClassTweaker v2")
+                        .range(element.firstChild)
+                        .create()
+                }
             }
-        } else if (element is CtFieldLiteral || element is CtMethodLiteral || element is CtClassLiteral) {
-            val target = element.text
-            val access = PsiTreeUtil.skipSiblingsBackward(element, PsiWhiteSpace::class.java)?.text
-            if (!TokenSets.compatibleByTargetMap.get(target).contains(access)) {
-                holder.newAnnotation(HighlightSeverity.ERROR, "'$target' cannot be used with '$access'").create()
+            is CtFieldLiteral, is CtMethodLiteral, is CtClassLiteral -> {
+                val target = element.text
+                val access = PsiTreeUtil.skipSiblingsBackward(element, PsiWhiteSpace::class.java)?.text
+                if (!TokenSets.compatibleByTargetMap.get(target).contains(access)) {
+                    holder.newAnnotation(HighlightSeverity.ERROR, "'$target' cannot be used with '$access'").create()
+                }
             }
         }
     }
diff --git a/src/main/kotlin/platform/mcp/ct/CtColorSettingsPage.kt b/src/main/kotlin/platform/mcp/ct/CtColorSettingsPage.kt
@@ -32,9 +32,9 @@ class CtColorSettingsPage : ColorSettingsPage {
     override fun getHighlighter() = CtSyntaxHighlighter()
     override fun getDemoText() =
         $$"""
-        classTweaker	v1	named
+        classTweaker	v2	named
         
-        # https://www.fabricmc.net/wiki/tutorial:accesswideners
+        # https://docs.fabricmc.net/develop/class-tweakers/
         
         extendable class net/minecraft/world/item/crafting/Ingredient
         transitive-extendable class net/minecraft/world/item/crafting/Ingredient
@@ -45,6 +45,8 @@ class CtColorSettingsPage : ColorSettingsPage {
         accessible field net/minecraft/world/item/crafting/Ingredient values [Lnet/minecraft/world/item/crafting/Ingredient$Value;
         inject-interface net/minecraft/world/level/block/Block com/example/MyBlockInterface
         transitive-inject-interface net/minecraft/world/level/block/Block com/example/MyTransitiveBlockInterface<TT;>
+        extend-enum net/minecraft/client/gui/Gui$HeartType MYMOD_HEART_TYPE
+        transitive-extend-enum net/minecraft/client/gui/Gui$HeartType MYMOD_TRANSITIVE_HEART_TYPE
         """.trimIndent()
 
     override fun getAdditionalHighlightingTagToDescriptorMap(): Map<String, TextAttributesKey>? = null
@@ -58,6 +60,7 @@ class CtColorSettingsPage : ColorSettingsPage {
             AttributesDescriptor("Header namespace", CtSyntaxHighlighter.HEADER_NAMESPACE),
             AttributesDescriptor("Access", CtSyntaxHighlighter.ACCESS),
             AttributesDescriptor("Inject interface", CtSyntaxHighlighter.INJECT_INTERFACE),
+            AttributesDescriptor("Extend enum", CtSyntaxHighlighter.EXTEND_ENUM),
             AttributesDescriptor("Class element", CtSyntaxHighlighter.CLASS_ELEMENT),
             AttributesDescriptor("Method element", CtSyntaxHighlighter.METHOD_ELEMENT),
             AttributesDescriptor("Field element", CtSyntaxHighlighter.FIELD_ELEMENT),
diff --git a/src/main/kotlin/platform/mcp/ct/CtCompletionContributor.kt b/src/main/kotlin/platform/mcp/ct/CtCompletionContributor.kt
@@ -111,7 +111,9 @@ object CtEntryStartCompletionProvider : CompletionProvider<CompletionParameters>
             "mutable",
             "transitive-mutable",
             "inject-interface",
-            "transitive-inject-interface"
+            "transitive-inject-interface",
+            "extend-enum",
+            "transitive-extend-enum",
         ).map { LookupElementBuilder.create(it).withInsertHandler { ctx, _ -> insertWhitespace(ctx) } }
         result.addAllElements(elements)
     }
diff --git a/src/main/kotlin/platform/mcp/ct/CtSyntaxHighlighter.kt b/src/main/kotlin/platform/mcp/ct/CtSyntaxHighlighter.kt
@@ -38,6 +38,7 @@ class CtSyntaxHighlighter : SyntaxHighlighterBase() {
             CtTypes.HEADER_NAMESPACE_ELEMENT -> HEADER_NAMESPACE_KEYS
             CtTypes.ACCESS_ELEMENT -> ACCESS_KEYS
             CtTypes.INJECT_INTERFACE_ELEMENT -> INJECT_INTERFACE_KEYS
+            CtTypes.EXTEND_ENUM_ELEMENT -> EXTEND_ENUM_KEYS
             CtTypes.CLASS_ELEMENT -> CLASS_ELEMENT_KEYS
             CtTypes.METHOD_ELEMENT -> METHOD_ELEMENT_KEYS
             CtTypes.FIELD_ELEMENT -> FIELD_ELEMENT_KEYS
@@ -60,6 +61,8 @@ class CtSyntaxHighlighter : SyntaxHighlighterBase() {
             TextAttributesKey.createTextAttributesKey("CT_ACCESS", DefaultLanguageHighlighterColors.KEYWORD)
         val INJECT_INTERFACE =
             TextAttributesKey.createTextAttributesKey("CT_INJECT_INTERFACE", DefaultLanguageHighlighterColors.KEYWORD)
+        val EXTEND_ENUM =
+            TextAttributesKey.createTextAttributesKey("CT_EXTEND_ENUM", DefaultLanguageHighlighterColors.KEYWORD)
         val CLASS_ELEMENT =
             TextAttributesKey.createTextAttributesKey("CT_CLASS_ELEMENT", DefaultLanguageHighlighterColors.KEYWORD)
         val METHOD_ELEMENT =
@@ -85,6 +88,7 @@ class CtSyntaxHighlighter : SyntaxHighlighterBase() {
         private val HEADER_NAMESPACE_KEYS = arrayOf(HEADER_NAMESPACE)
         private val ACCESS_KEYS = arrayOf(ACCESS)
         private val INJECT_INTERFACE_KEYS = arrayOf(INJECT_INTERFACE)
+        private val EXTEND_ENUM_KEYS = arrayOf(EXTEND_ENUM)
         private val CLASS_ELEMENT_KEYS = arrayOf(CLASS_ELEMENT)
         private val METHOD_ELEMENT_KEYS = arrayOf(METHOD_ELEMENT)
         private val FIELD_ELEMENT_KEYS = arrayOf(FIELD_ELEMENT)
diff --git a/src/main/kotlin/platform/mcp/ct/psi/mixins/CtExtendEnumEntryMixin.kt b/src/main/kotlin/platform/mcp/ct/psi/mixins/CtExtendEnumEntryMixin.kt
@@ -0,0 +1,23 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 minecraft-dev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, version 3.0 only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.demonwav.mcdev.platform.mcp.ct.psi.mixins
+
+interface CtExtendEnumEntryMixin : CtEntryMixin
diff --git a/src/main/kotlin/platform/mcp/ct/psi/mixins/impl/CtExtendEnumEntryImplMixin.kt b/src/main/kotlin/platform/mcp/ct/psi/mixins/impl/CtExtendEnumEntryImplMixin.kt
@@ -0,0 +1,26 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 minecraft-dev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, version 3.0 only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.demonwav.mcdev.platform.mcp.ct.psi.mixins.impl
+
+import com.demonwav.mcdev.platform.mcp.ct.psi.mixins.CtExtendEnumEntryMixin
+import com.intellij.lang.ASTNode
+
+abstract class CtExtendEnumEntryImplMixin(node: ASTNode): CtEntryImplMixin(node), CtExtendEnumEntryMixin
diff --git a/src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt b/src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt
@@ -48,7 +48,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {
     override fun resolveTarget(annotation: PsiAnnotation, targetClass: ClassNode): List<MixinTargetMember> {
         if (hasAliases(annotation)) return emptyList()
         val member = annotation.parentOfType<PsiMember>() ?: return emptyList()
-        val name = stripPrefix(annotation, member) ?: return emptyList()
+        val name = getEffectiveName(annotation, member) ?: return emptyList()
         return when (member) {
             is PsiMethod -> listOfNotNull(
                 targetClass.findMethod(MemberReference(name, member.descriptor))
@@ -75,7 +75,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {
             is PsiField -> "field"
             else -> return null
         }
-        return "Unresolved $type ${member.name} in target class"
+        return "Unresolved $type ${getEffectiveName(annotation, member)} in target class"
     }
 
     fun findFirstShadowTargetForNavigation(member: PsiMember): SmartPsiElementPointer<PsiElement>? {
@@ -94,7 +94,10 @@ class ShadowHandler : MixinMemberAnnotationHandler {
 
     private fun hasAliases(shadow: PsiAnnotation) = shadow.findDeclaredAttributeValue("aliases").isNotEmpty()
 
-    private fun stripPrefix(shadow: PsiAnnotation, member: PsiMember): String? {
+    private fun getEffectiveName(shadow: PsiAnnotation, member: PsiMember): String? {
+        if (member is PsiMethod && member.isConstructor) {
+            return "<init>"
+        }
         // Strip prefix
         val prefix = shadow.findDeclaredAttributeValue("prefix")?.constantStringValue
             ?: MixinConstants.DEFAULT_SHADOW_PREFIX
diff --git a/src/main/kotlin/platform/mixin/inspection/MixinClassTypeInspection.kt b/src/main/kotlin/platform/mixin/inspection/MixinClassTypeInspection.kt
@@ -22,6 +22,7 @@ package com.demonwav.mcdev.platform.mixin.inspection
 
 import com.demonwav.mcdev.platform.mixin.util.hasAccess
 import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
+import com.demonwav.mcdev.platform.mixin.util.isFabricMixin
 import com.demonwav.mcdev.platform.mixin.util.isMixin
 import com.demonwav.mcdev.platform.mixin.util.mixinTargets
 import com.intellij.codeInspection.LocalQuickFix
@@ -68,7 +69,7 @@ class MixinClassTypeInspection : MixinInspection() {
                 }
             }
 
-            if (mixinClass.isEnum) {
+            if (mixinClass.isEnum && !mixinClass.isFabricMixin) {
                 holder.registerProblem(problemElement, "Mixins cannot be enums", *fixes.toTypedArray())
                 return
             }
diff --git a/src/main/kotlin/platform/mixin/inspection/StaticMemberInspection.kt b/src/main/kotlin/platform/mixin/inspection/StaticMemberInspection.kt
@@ -30,6 +30,7 @@ import com.intellij.codeInsight.intention.QuickFixFactory
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.JavaElementVisitor
 import com.intellij.psi.PsiElementVisitor
+import com.intellij.psi.PsiEnumConstant
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
@@ -71,7 +72,7 @@ class StaticMemberInspection : MixinInspection() {
 
         private fun isProblematic(member: PsiMember): Boolean {
             val containingClass = member.containingClass ?: return false
-            if (!containingClass.isMixin) {
+            if (!containingClass.isMixin || member is PsiEnumConstant) {
                 return false
             }
 
diff --git a/src/main/kotlin/platform/mixin/inspection/addedMembers/MissingUniqueAnnotationInspection.kt b/src/main/kotlin/platform/mixin/inspection/addedMembers/MissingUniqueAnnotationInspection.kt
diff --git a/src/main/kotlin/util/bytecode-utils.kt b/src/main/kotlin/util/bytecode-utils.kt

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import com.demonwav.mcdev.platform.mcp.util.McpConstants`
`29`	`29`	`import com.demonwav.mcdev.translations.TranslationFileListener`
`30`	`30`	`import com.demonwav.mcdev.util.runWriteTaskLater`
`31`	`31`	`import com.intellij.json.JsonFileType`
	`32`	`+import com.intellij.openapi.application.ApplicationManager`
`32`	`33`	`import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder`
`33`	`34`	`import com.intellij.openapi.externalSystem.util.ExternalSystemUtil`
`34`	`35`	`import com.intellij.openapi.fileTypes.FileTypeManager`
`@@ -71,7 +72,10 @@ class McpModule(facet: MinecraftFacet) : AbstractModule(facet) {`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`if (requiresRefresh) {`
`74`		`- ExternalSystemUtil.refreshProjects(ImportSpecBuilder(project, GradleConstants.SYSTEM_ID))`
	`75`	`+ // Schedule Gradle project refresh outside write lock`
	`76`	`+ ApplicationManager.getApplication().invokeLater {`
	`77`	`+ ExternalSystemUtil.refreshProjects(ImportSpecBuilder(project, GradleConstants.SYSTEM_ID))`
	`78`	`+ }`
`75`	`79`	`}`
`76`	`80`	`}`
`77`	`81`	`}`