Merge branch '2025.1' into 2025.2

Author: Earthcomputer

buildSrc/src/main/kotlin/mcdev-core.gradle.kts

@@ -43,6 +43,9 @@ version = "$ideaVersionName-$coreVersion"
 if (buildNumber != null) {
     version = "$version-nightly+$buildNumber"
 }
+if (System.getenv("CI") != "true") {
+    version = "$version-local"
+}
 
 java {
     toolchain {

changelog.md

@@ -1,5 +1,12 @@
 # Minecraft Development for IntelliJ
 
+## [1.8.9]
+
+### Fixed
+
+- Fixed freeze in project creator
+- Fixed ModifyExpressionValue sometimes being detected as disallowed if MixinExtras expressions are used
+
 ## [1.8.8]
 
 ### Fixed

gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1g
 
 ideaVersionName = 2025.2
 
-coreVersion = 1.8.8
+coreVersion = 1.8.9
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false

readme.md

@@ -31,7 +31,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.8-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.9-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/main/kotlin/creator/custom/providers/TemplateProvider.kt

@@ -82,34 +82,38 @@ interface TemplateProvider {
             bundle: ResourceBundle? = null
         ): List<VfsLoadedTemplate> {
             val bundle = bundle ?: loadMessagesBundle(modalityState, repoRoot)
+            val templatesToLoad = mutableListOf<VirtualFile>()
             val visitor = object : VirtualFileVisitor<Unit>() {
                 override fun visitFile(file: VirtualFile): Boolean {
                     if (!file.isFile || !file.name.endsWith(".mcdev.template.json")) {
                         return true
                     }
 
-                    runBlocking(Dispatchers.Unconfined) {
-                        try {
-                            createVfsLoadedTemplate(modalityState, file.parent, file, bundle = bundle)
-                                ?.let(templates::add)
-                        } catch (t: Throwable) {
-                            if (t is ControlFlowException) {
-                                throw t
-                            }
-
-                            val attachment = runCatching { Attachment(file.name, file.readText()) }.getOrNull()
-                            if (attachment != null) {
-                                thisLogger().error("Failed to load template ${file.path}", t, attachment)
-                            } else {
-                                thisLogger().error("Failed to load template ${file.path}", t)
-                            }
-                        }
-                    }
+                    templatesToLoad += file
 
                     return true
                 }
             }
             VfsUtilCore.visitChildrenRecursively(repoRoot, visitor)
+
+            for (file in templatesToLoad) {
+                try {
+                    createVfsLoadedTemplate(modalityState, file.parent, file, bundle = bundle)
+                        ?.let(templates::add)
+                } catch (t: Throwable) {
+                    if (t is ControlFlowException) {
+                        throw t
+                    }
+
+                    val attachment = runCatching { Attachment(file.name, file.readText()) }.getOrNull()
+                    if (attachment != null) {
+                        thisLogger().error("Failed to load template ${file.path}", t, attachment)
+                    } else {
+                        thisLogger().error("Failed to load template ${file.path}", t)
+                    }
+                }
+            }
+
             return templates
         }
 

src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleProjectResolverExtension.kt

@@ -21,6 +21,7 @@
 package com.demonwav.mcdev.platform.mcp.vanillagradle
 
 import com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle.VanillaGradleModel
+import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.project.ModuleData
 import org.gradle.tooling.model.idea.IdeaModule
@@ -34,7 +35,9 @@ class VanillaGradleProjectResolverExtension : AbstractProjectResolverExtension()
     override fun getToolingExtensionsClasses() = extraProjectModelClasses
 
     override fun populateModuleExtraModels(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) {
-        val vgData = resolverCtx.getExtraProject(gradleModule, VanillaGradleModel::class.java)
+        val vgData = runReadAction {
+            resolverCtx.getExtraProject(gradleModule, VanillaGradleModel::class.java)
+        }
         if (vgData != null && vgData.hasVanillaGradle()) {
             val gradleProjectPath = gradleModule.gradleProject.projectIdentifier.projectPath
             val suffix = if (gradleProjectPath.endsWith(':')) "" else ":"

src/main/kotlin/platform/mixin/handlers/mixinextras/ModifyExpressionValueHandler.kt

@@ -46,6 +46,10 @@ class ModifyExpressionValueHandler : MixinExtrasInjectorAnnotationHandler() {
             return false
         }
 
+        if (decorations[ExpressionDecorations.SIMPLE_EXPRESSION_TYPE] != null) {
+            return true
+        }
+
         val returnType = getInsnReturnType(insn) ?: return false
         return returnType != Type.VOID_TYPE
     }