Merge branch '2025.1' into 2025.2

Author: Earthcomputer

changelog.md

@@ -1,5 +1,18 @@
 # Minecraft Development for IntelliJ
 
+## [1.8.11]
+
+### Added
+
+- Using Minecraft version to recognize unobfuscated Minecraft
+
+### Fixed
+
+- Downgraded non-void WrapWithCondition to warning if there is a pop instruction afterwards
+- Fixed local templates freezing
+- Avoided a crash for unknown MC versions
+- Don't suggest that locals can use names with argsOnly = true
+
 ## [1.8.10]
 
 ### Fixed

gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1g
 
 ideaVersionName = 2025.2
 
-coreVersion = 1.8.10
+coreVersion = 1.8.11
 
 # 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.10-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.11-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/JdkComboBoxWithPreference.kt

@@ -20,7 +20,6 @@
 
 package com.demonwav.mcdev.creator
 
-import com.demonwav.mcdev.util.invokeLater
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.ide.util.projectWizard.ProjectWizardUtil
 import com.intellij.ide.util.projectWizard.WizardContext
@@ -43,7 +42,6 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.ui.dsl.builder.Cell
 import com.intellij.ui.dsl.builder.Row
 import javax.swing.JComponent
-import org.jetbrains.concurrency.runAsync
 
 internal class JdkPreferenceData(
     var jdk: JavaSdkVersion,
@@ -91,17 +89,15 @@ class JdkComboBoxWithPreference internal constructor(
             preferenceData.jdk = version
             reloadModel()
 
-            for (jdkVersion in version.ordinal until JavaSdkVersion.entries.size) {
-                val jdk = JavaSdkVersion.entries[jdkVersion]
+            for (jdkVersion in version.ordinal until JavaSdkVersion.values().size) {
+                val jdk = JavaSdkVersion.values()[jdkVersion]
 
                 val preferredSdkPath = preferenceData.sdkPathByJdk[jdk]
                 if (preferredSdkPath != null) {
                     val sdk = model.sdks.firstOrNull { it.homePath == preferredSdkPath }
                         ?: suggestions.firstOrNull { it.homePath == preferredSdkPath }
                     if (sdk != null) {
-                        runAsync {
-                            setSelectedItem(sdk)
-                        }
+                        setSelectedItem(sdk)
                         return
                     }
                 }
@@ -149,7 +145,7 @@ fun Row.jdkComboBoxWithPreference(
         for (preferenceDataStr in preferenceDataStrs) {
             val parts = preferenceDataStr.split('=', limit = 2)
             val featureVersion = parts.firstOrNull()?.toIntOrNull() ?: continue
-            val knownJdkVersions = JavaSdkVersion.entries
+            val knownJdkVersions = JavaSdkVersion.values()
             if (featureVersion !in knownJdkVersions.indices) {
                 continue
             }
@@ -180,9 +176,7 @@ fun Row.jdkComboBoxWithPreference(
     }
 
     val lastUsedSdk = stateComponent.getValue(selectedJdkProperty)
-    runAsync {
-        ProjectWizardUtil.preselectJdkForNewModule(project, lastUsedSdk, comboBox) { true }
-    }
+    ProjectWizardUtil.preselectJdkForNewModule(project, lastUsedSdk, comboBox) { true }
 
     val windowChild = context.getUserData(AbstractWizard.KEY)!!.contentPanel
     comboBox.loadSuggestions(windowChild, context.disposable)

src/main/kotlin/creator/custom/CreatorTemplateProcessor.kt

@@ -34,7 +34,6 @@ import com.intellij.codeInsight.actions.ReformatCodeProcessor
 import com.intellij.ide.projectView.ProjectView
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.openapi.application.WriteAction
-import com.intellij.openapi.concurrency.awaitPromise
 import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.openapi.diagnostic.ControlFlowException
 import com.intellij.openapi.diagnostic.thisLogger
@@ -54,15 +53,11 @@ import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.application
 import java.nio.file.Path
-import java.time.Duration
-import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
 import kotlin.io.path.createDirectories
 import kotlin.io.path.writeText
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import org.jetbrains.concurrency.await
-import org.jetbrains.concurrency.runAsync
 
 interface ExternalTemplatePropertyProvider {
 
@@ -273,11 +268,7 @@ class CreatorTemplateProcessor(
                 destPath.parent.createDirectories()
                 destPath.writeText(processedContent)
 
-                val virtualFile = runCatching {
-                    runAsync {
-                        destPath.refreshAndFindVirtualFile()
-                    }.blockingGet(20, TimeUnit.MILLISECONDS)
-                }.getOrNull()
+                val virtualFile = destPath.refreshAndFindVirtualFile()
                 if (virtualFile != null) {
                     generatedFiles.add(file to virtualFile)
                 } else {

src/main/kotlin/creator/custom/CustomPlatformStep.kt

@@ -27,18 +27,12 @@ import com.demonwav.mcdev.creator.custom.providers.LoadedTemplate
 import com.demonwav.mcdev.creator.custom.providers.TemplateProvider
 import com.demonwav.mcdev.creator.modalityState
 import com.demonwav.mcdev.util.getOrLogException
-import com.demonwav.mcdev.util.invokeAndWait
-import com.demonwav.mcdev.util.runWriteTask
-import com.demonwav.mcdev.util.tryWriteSafeContext
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
 import com.intellij.ide.wizard.GitNewProjectWizardData
 import com.intellij.ide.wizard.NewProjectWizardBaseData
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.application.EDT
-import com.intellij.openapi.application.ModalityState
-import com.intellij.openapi.application.TransactionGuard
 import com.intellij.openapi.application.asContextElement
-import com.intellij.openapi.application.impl.ModalityStateEx
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.observable.properties.GraphProperty
@@ -57,12 +51,10 @@ import com.intellij.ui.dsl.builder.bindText
 import com.intellij.util.application
 import com.intellij.util.ui.AsyncProcessIcon
 import javax.swing.JLabel
-import javax.swing.SwingUtilities
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import org.jetbrains.kotlin.descriptors.Modality
 
 /**
  * The step to select a custom template repo.
@@ -75,7 +67,7 @@ class CustomPlatformStep(
     val creatorUiScope = TemplateService.instance.scope("MinecraftDev Creator UI")
     val templateRepos = MinecraftSettings.instance.creatorTemplateRepos
 
-    val templateRepoProperty = propertyGraph.property(
+    val templateRepoProperty = propertyGraph.property<MinecraftSettings.TemplateRepo>(
         templateRepos.firstOrNull() ?: MinecraftSettings.TemplateRepo.makeBuiltinRepo()
     )
     var templateRepo by templateRepoProperty
@@ -87,19 +79,19 @@ class CustomPlatformStep(
     lateinit var availableGroupsSegmentedButton: SegmentedButton<String>
     lateinit var availableTemplatesSegmentedButton: SegmentedButton<LoadedTemplate>
 
-    val selectedGroupProperty = propertyGraph.property("")
+    val selectedGroupProperty = propertyGraph.property<String>("")
     var selectedGroup by selectedGroupProperty
     val selectedTemplateProperty = propertyGraph.property<LoadedTemplate>(EmptyLoadedTemplate)
     var selectedTemplate by selectedTemplateProperty
 
-    val templateProvidersLoadingProperty = propertyGraph.property(true)
+    val templateProvidersLoadingProperty = propertyGraph.property<Boolean>(true)
     val templateProvidersTextProperty = propertyGraph.property("")
     val templateProvidersText2Property = propertyGraph.property("")
     lateinit var templateProvidersProcessIcon: Cell<AsyncProcessIcon>
 
-    val templateLoadingProperty = propertyGraph.property(false)
-    val templateLoadingTextProperty = propertyGraph.property("")
-    val templateLoadingText2Property = propertyGraph.property("")
+    val templateLoadingProperty = propertyGraph.property<Boolean>(false)
+    val templateLoadingTextProperty = propertyGraph.property<String>("")
+    val templateLoadingText2Property = propertyGraph.property<String>("")
     lateinit var templatePropertiesProcessIcon: Cell<AsyncProcessIcon>
     lateinit var noTemplatesAvailable: Cell<JLabel>
     var templateLoadingJob: Job? = null
@@ -256,9 +248,11 @@ class CustomPlatformStep(
         templateLoadingTextProperty.set(MCDevBundle("creator.step.generic.load_template.message"))
         templateLoadingProperty.set(true)
 
-        tryWriteSafeContext(context.modalityState) {
-            VirtualFileManager.getInstance().syncRefresh()
-        }
+        // For some reason syncRefresh doesn't play nice with writeAction() coroutines so we do it beforehand
+        application.invokeAndWait(
+            { runWriteAction { VirtualFileManager.getInstance().syncRefresh() } },
+            context.modalityState
+        )
 
         val dialogCoroutineContext = context.modalityState.asContextElement()
         val uiContext = dialogCoroutineContext + Dispatchers.EDT

src/main/kotlin/creator/custom/providers/RemoteTemplateProvider.kt

@@ -67,8 +67,6 @@ import javax.swing.ListCellRenderer
 import kotlin.io.path.absolutePathString
 import kotlin.io.path.exists
 import kotlin.io.path.writeBytes
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 open class RemoteTemplateProvider : TemplateProvider {
 
@@ -150,20 +148,18 @@ open class RemoteTemplateProvider : TemplateProvider {
         context: WizardContext,
         repo: MinecraftSettings.TemplateRepo,
         rawInnerPath: String
-    ): List<LoadedTemplate> = withContext(Dispatchers.IO) { // don't run on EDT
+    ): List<LoadedTemplate> {
         val remoteRootPath = RemoteTemplateRepo.getDestinationZip(repo.name)
         if (!remoteRootPath.exists()) {
-            return@withContext emptyList()
+            return emptyList()
         }
 
         val archiveRoot = remoteRootPath.absolutePathString() + JarFileSystem.JAR_SEPARATOR
 
         val fs = JarFileSystem.getInstance()
-
         val rootFile = fs.refreshAndFindFileByPath(archiveRoot)
-            ?: return@withContext emptyList()
+            ?: return emptyList()
         val modalityState = context.modalityState
-
         rootFile.refreshSync(modalityState)
 
         val innerPath = replaceVariables(rawInnerPath)
@@ -174,10 +170,10 @@ open class RemoteTemplateProvider : TemplateProvider {
         }
 
         if (repoRoot == null) {
-            return@withContext emptyList()
+            return emptyList()
         }
 
-        return@withContext TemplateProvider.findTemplates(modalityState, repoRoot)
+        return TemplateProvider.findTemplates(modalityState, repoRoot)
     }
 
     private fun replaceVariables(originalRepoUrl: String): String =
@@ -271,7 +267,7 @@ open class RemoteTemplateProvider : TemplateProvider {
                             index: Int,
                             isSelected: Boolean,
                             cellHasFocus: Boolean
-                        ): Component {
+                        ): Component? {
                             text = value?.displayname?.let(MCDevBundle::invoke) ?: value?.name?.capitalize().toString()
                             return this
                         }

src/main/kotlin/creator/custom/providers/TemplateProvider.kt

@@ -45,9 +45,9 @@ import com.intellij.serviceContainer.BaseKeyedLazyInstance
 import com.intellij.util.KeyedLazyInstance
 import com.intellij.util.xmlb.annotations.Attribute
 import java.util.ResourceBundle
-import java.util.concurrent.TimeUnit
 import javax.swing.JComponent
-import org.jetbrains.concurrency.runAsync
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 
 /**
  * Extensions responsible for creating a [TemplateDescriptor] based on whatever data it is provided in its configuration
@@ -75,12 +75,13 @@ interface TemplateProvider {
 
         fun getAllKeys() = EP_NAME.extensionList.mapNotNull { it.key }
 
-        fun findTemplates(
+        suspend fun findTemplates(
             modalityState: ModalityState,
             repoRoot: VirtualFile,
             templates: MutableList<VfsLoadedTemplate> = mutableListOf(),
-            bundle: ResourceBundle? = loadMessagesBundle(modalityState, repoRoot)
+            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 {
@@ -116,7 +117,7 @@ interface TemplateProvider {
             return templates
         }
 
-        fun loadMessagesBundle(modalityState: ModalityState, repoRoot: VirtualFile): ResourceBundle? = try {
+        suspend fun loadMessagesBundle(modalityState: ModalityState, repoRoot: VirtualFile): ResourceBundle? = try {
             val locale = DynamicBundle.getLocale()
             // Simplified bundle resolution, but covers all the most common cases
             val baseBundle = doLoadMessageBundle(
@@ -143,7 +144,7 @@ interface TemplateProvider {
             null
         }
 
-        private fun doLoadMessageBundle(
+        private suspend fun doLoadMessageBundle(
             file: VirtualFile?,
             modalityState: ModalityState,
             parent: ResourceBundle?
@@ -153,9 +154,8 @@ interface TemplateProvider {
             }
 
             try {
-                return runAsync {
-                    file.inputStream.reader().use { TemplateResourceBundle(it, parent) }
-                }.blockingGet(20, TimeUnit.MILLISECONDS)
+                return file.refreshSync(modalityState)
+                    ?.inputStream?.reader()?.use { TemplateResourceBundle(it, parent) }
             } catch (t: Throwable) {
                 if (t is ControlFlowException) {
                     return parent
@@ -167,19 +167,15 @@ interface TemplateProvider {
             return parent
         }
 
-        fun createVfsLoadedTemplate(
+        suspend fun createVfsLoadedTemplate(
             modalityState: ModalityState,
             templateRoot: VirtualFile,
             descriptorFile: VirtualFile,
             tooltip: String? = null,
             bundle: ResourceBundle? = null
         ): VfsLoadedTemplate? {
-            var descriptor = runCatching {
-                runAsync {
-                    descriptorFile.refreshSync(modalityState)
-                    Gson().fromJson<TemplateDescriptor>(descriptorFile.readText())
-                }.blockingGet(100, TimeUnit.MILLISECONDS)
-            }.getOrNull() ?: return null
+            descriptorFile.refreshSync(modalityState)
+            var descriptor = Gson().fromJson<TemplateDescriptor>(descriptorFile.readText())
             if (descriptor.version != TemplateDescriptor.FORMAT_VERSION) {
                 thisLogger().warn("Cannot handle template ${descriptorFile.path} of version ${descriptor.version}")
                 return null
@@ -198,7 +194,7 @@ interface TemplateProvider {
                 descriptor.translateOrNull("platform.${labelKey.lowercase()}.label") ?: descriptor.translate(labelKey)
 
             if (descriptor.inherit != null) {
-                val parent = templateRoot.findFileByRelativePath(descriptor.inherit)
+                val parent = templateRoot.findFileByRelativePath(descriptor.inherit!!)
                 if (parent != null) {
                     parent.refresh(false, false)
                     val parentDescriptor = Gson().fromJson<TemplateDescriptor>(parent.readText())
@@ -235,5 +231,5 @@ class TemplateProviderBean : BaseKeyedLazyInstance<TemplateProvider>(), KeyedLaz
 
     override fun getKey(): String = name
 
-    override fun getImplementationClassName(): String = implementation
+    override fun getImplementationClassName(): String? = implementation
 }

src/main/kotlin/platform/mixin/expression/MEExpressionCompletionUtil.kt

@@ -992,7 +992,7 @@ object MEExpressionCompletionUtil {
             val locals = localsHere.filter { it.index == index }
 
             val elementFactory = JavaPsiFacade.getElementFactory(project)
-            val hasNamedLocalVariables = mixinClass.findModule()?.hasNamedLocalVariables(targetClass.name.replace('/', '.')) != false
+            val hasNamedLocalVariables = mixinClass.hasNamedLocalVariables(targetClass.name.replace('/', '.'))
 
             return locals.map { localVariable ->
                 val localPsiType = if (localVariable.signature != null) {