Merge branch '2025.1' into 2025.2

Author: Earthcomputer

build.gradle.kts

@@ -188,11 +188,6 @@ tasks.withType<GroovyCompile>().configureEach {
 }
 
 tasks.processResources {
-    for (lang in arrayOf("", "_en")) {
-        from("src/main/resources/messages.MinecraftDevelopment_en_US.properties") {
-            rename { "messages.MinecraftDevelopment$lang.properties" }
-        }
-    }
     // These templates aren't allowed to be in a directory structure in the output jar
     // But we have a lot of templates that would get real hard to deal with if we didn't have some structure
     // So this just flattens out the fileTemplates/j2ee directory in the jar, while still letting us have directories

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /src/main/resources/messages/MinecraftDevelopment.properties
+    translation: /src/main/resources/messages/MinecraftDevelopment_%two_letters_code%.properties

readme.md

@@ -11,10 +11,6 @@ Minecraft Development for IntelliJ
         <td align="right"><b>Main Build</b></td>
         <td colspan="2"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Build"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Build)/statusIcon.svg" alt="Teamcity Build Status" /></a></td>
     </tr>
-    <tr>
-        <td align="left">2024.2</td>
-        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20242"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20242)/statusIcon.svg" alt="2024.2 Nightly Status" /></a></td>
-    </tr>
     <tr>
         <td align="left">2024.3</td>
         <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20243"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20243)/statusIcon.svg" alt="2024.3 Nightly Status" /></a></td>
@@ -35,7 +31,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.5-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.6-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/platform/mixin/handlers/injectionPoint/FieldInjectionPoint.kt

@@ -21,12 +21,10 @@
 package com.demonwav.mcdev.platform.mixin.handlers.injectionPoint
 
 import com.demonwav.mcdev.platform.mixin.reference.MixinSelector
-import com.demonwav.mcdev.platform.mixin.reference.toMixinString
 import com.demonwav.mcdev.platform.mixin.util.fakeResolve
 import com.demonwav.mcdev.platform.mixin.util.findOrConstructSourceField
 import com.demonwav.mcdev.util.MemberReference
 import com.demonwav.mcdev.util.constantValue
-import com.demonwav.mcdev.util.getQualifiedMemberReference
 import com.intellij.codeInsight.completion.JavaLookupElementBuilder
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.openapi.editor.Editor
@@ -107,10 +105,11 @@ class FieldInjectionPoint : QualifiedInjectionPoint<PsiField>() {
         return target?.let { MyCollectVisitor(mode, at.project, it, opcode, arrayAccess, fuzz) }
     }
 
-    override fun createLookup(targetClass: ClassNode, m: PsiField, owner: String): LookupElementBuilder {
+    override fun createLookup(targetClass: ClassNode, m: PsiField, insn: AbstractInsnNode): LookupElementBuilder {
+        insn as FieldInsnNode
         return JavaLookupElementBuilder.forField(
             m,
-            m.getQualifiedMemberReference(owner).toMixinString(),
+            "L${insn.owner};.${insn.name}:${insn.desc}",
             null,
         )
             .setBoldIfInClass(m, targetClass)

src/main/kotlin/platform/mixin/handlers/injectionPoint/InjectionPoint.kt

@@ -21,7 +21,6 @@
 package com.demonwav.mcdev.platform.mixin.handlers.injectionPoint
 
 import com.demonwav.mcdev.platform.mixin.reference.MixinSelector
-import com.demonwav.mcdev.platform.mixin.reference.toMixinString
 import com.demonwav.mcdev.platform.mixin.util.InjectionPointSpecifier
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.SLICE
 import com.demonwav.mcdev.platform.mixin.util.SourceCodeLocationInfo
@@ -32,7 +31,6 @@ import com.demonwav.mcdev.util.constantValue
 import com.demonwav.mcdev.util.createLiteralExpression
 import com.demonwav.mcdev.util.findAnnotations
 import com.demonwav.mcdev.util.fullQualifiedName
-import com.demonwav.mcdev.util.getQualifiedMemberReference
 import com.demonwav.mcdev.util.internalName
 import com.demonwav.mcdev.util.memoized
 import com.demonwav.mcdev.util.realName
@@ -132,30 +130,32 @@ abstract class InjectionPoint<T : PsiElement> {
         return doCreateCollectVisitor(at, target, targetClass, mode)?.also {
             val isInsideSlice = at.parentOfType<PsiAnnotation>()?.hasQualifiedName(SLICE) == true
             val defaultSpecifier = if (isInsideSlice) InjectionPointSpecifier.FIRST else InjectionPointSpecifier.ALL
-            addFilters(at, targetClass, it, defaultSpecifier)
+            addFilters(at, targetClass, it, defaultSpecifier, mode)
         }
     }
 
     protected open fun addFilters(
         at: PsiAnnotation,
         targetClass: ClassNode,
         collectVisitor: CollectVisitor<T>,
-        defaultSpecifier: InjectionPointSpecifier
+        defaultSpecifier: InjectionPointSpecifier,
+        mode: CollectVisitor.Mode,
     ) {
-        addStandardFilters(at, targetClass, collectVisitor, defaultSpecifier)
+        addStandardFilters(at, targetClass, collectVisitor, defaultSpecifier, mode)
     }
 
     fun addStandardFilters(
         at: PsiAnnotation,
         targetClass: ClassNode,
         collectVisitor: CollectVisitor<T>,
-        defaultSpecifier: InjectionPointSpecifier
+        defaultSpecifier: InjectionPointSpecifier,
+        mode: CollectVisitor.Mode,
     ) {
         addShiftSupport(at, targetClass, collectVisitor)
         addSliceFilter(at, targetClass, collectVisitor)
         // make sure the ordinal filter is last, so that the ordinal only increments once the other filters have passed
         addOrdinalFilter(at, targetClass, collectVisitor)
-        addSpecifierFilter(at, targetClass, collectVisitor, defaultSpecifier)
+        addSpecifierFilter(at, targetClass, collectVisitor, defaultSpecifier, mode)
     }
 
     protected open fun addShiftSupport(at: PsiAnnotation, targetClass: ClassNode, collectVisitor: CollectVisitor<*>) {
@@ -215,8 +215,13 @@ abstract class InjectionPoint<T : PsiElement> {
         at: PsiAnnotation,
         targetClass: ClassNode,
         collectVisitor: CollectVisitor<T>,
-        defaultSpecifier: InjectionPointSpecifier
+        defaultSpecifier: InjectionPointSpecifier,
+        mode: CollectVisitor.Mode,
     ) {
+        if (mode == CollectVisitor.Mode.COMPLETION) {
+            // Ignore the specifier, we want to show all results
+            return
+        }
         val point = at.findDeclaredAttributeValue("value")?.constantStringValue ?: return
         val specifier = InjectionPointSpecifier.entries.firstOrNull { point.endsWith(":$it") } ?: defaultSpecifier
         collectVisitor.addResultFilter("specifier") { results, _ ->
@@ -262,7 +267,7 @@ abstract class QualifiedInjectionPoint<T : PsiMember> : InjectionPoint<T>() {
 
     final override fun usesMemberReference() = true
 
-    protected abstract fun createLookup(targetClass: ClassNode, m: T, owner: String): LookupElementBuilder
+    protected abstract fun createLookup(targetClass: ClassNode, m: T, insn: AbstractInsnNode): LookupElementBuilder
 
     protected open fun getInternalName(m: T): String {
         return m.realName ?: m.name!!
@@ -273,7 +278,7 @@ abstract class QualifiedInjectionPoint<T : PsiMember> : InjectionPoint<T>() {
         result: CollectVisitor.Result<T>,
     ): LookupElementBuilder {
         return qualifyLookup(
-            createLookup(targetClass, result.target, result.qualifier ?: targetClass.name),
+            createLookup(targetClass, result.target, result.originalInsn),
             targetClass,
             result.target,
         )
@@ -296,10 +301,11 @@ abstract class QualifiedInjectionPoint<T : PsiMember> : InjectionPoint<T>() {
 
 abstract class AbstractMethodInjectionPoint : QualifiedInjectionPoint<PsiMethod>() {
 
-    override fun createLookup(targetClass: ClassNode, m: PsiMethod, owner: String): LookupElementBuilder {
+    override fun createLookup(targetClass: ClassNode, m: PsiMethod, insn: AbstractInsnNode): LookupElementBuilder {
+        insn as MethodInsnNode
         return JavaLookupElementBuilder.forMethod(
             m,
-            m.getQualifiedMemberReference(owner).toMixinString(),
+            "L${insn.owner};${insn.name}${insn.desc}",
             PsiSubstitutor.EMPTY,
             null,
         )

src/main/kotlin/platform/mixin/handlers/injectionPoint/NewInsnInjectionPoint.kt

@@ -27,10 +27,8 @@ import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.AT
 import com.demonwav.mcdev.platform.mixin.util.findClassNodeByPsiClass
 import com.demonwav.mcdev.platform.mixin.util.findMethod
-import com.demonwav.mcdev.platform.mixin.util.shortName
 import com.demonwav.mcdev.util.MemberReference
 import com.demonwav.mcdev.util.constantStringValue
-import com.demonwav.mcdev.util.descriptor
 import com.demonwav.mcdev.util.fullQualifiedName
 import com.demonwav.mcdev.util.internalName
 import com.demonwav.mcdev.util.shortName
@@ -110,18 +108,19 @@ class NewInsnInjectionPoint : InjectionPoint<PsiMember>() {
     }
 
     override fun createLookup(targetClass: ClassNode, result: CollectVisitor.Result<PsiMember>): LookupElementBuilder? {
+        val newInsn = result.originalInsn as? TypeInsnNode ?: return null
+        val methodInsn = findInitCall(newInsn) ?: return null
         when (val target = result.target) {
             is PsiClass -> {
                 return JavaLookupElementBuilder.forClass(target, target.internalName)
                     .withPresentableText(target.shortName ?: return null)
             }
             is PsiMethod -> {
-                val ownerName = result.qualifier?.substringAfterLast('.')?.replace('$', '.') ?: targetClass.shortName
-                val descriptorArgs = target.descriptor?.dropLast(1) ?: return null
-                val qualifierInternalName = result.qualifier?.replace('.', '/')
+                val ownerName = methodInsn.owner.substringAfterLast('/').replace('$', '.')
+                val descriptorArgs = methodInsn.desc.dropLast(1)
                 return JavaLookupElementBuilder.forMethod(
                     target,
-                    "${descriptorArgs}L$qualifierInternalName;",
+                    "${descriptorArgs}L${methodInsn.owner};",
                     PsiSubstitutor.EMPTY,
                     null,
                 )

src/main/kotlin/platform/mixin/inspection/mixinextras/LocalArgsOnlyInspection.kt

@@ -29,7 +29,7 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.MixinExtras.unwrapLocalRef
 import com.demonwav.mcdev.util.constantValue
 import com.demonwav.mcdev.util.findContainingMethod
-import com.demonwav.mcdev.util.mapFirstNotNull
+import com.demonwav.mcdev.util.ifEmpty
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.JavaElementVisitor
 import com.intellij.psi.PsiAnnotation
@@ -52,15 +52,15 @@ class LocalArgsOnlyInspection : MixinInspection() {
             val parameter = localAnnotation.parentOfType<PsiParameter>() ?: return
             val method = parameter.findContainingMethod() ?: return
 
-            val targets = method.annotations.mapFirstNotNull { annotation ->
+            val targets = method.annotations.flatMap { annotation ->
                 MixinAnnotationHandler.resolveTarget(annotation).asSequence()
                     .filterIsInstance<MethodTargetMember>()
                     .map { it.classAndMethod }
-            } ?: return
+            }.ifEmpty { return }
 
             val localType = parameter.type.unwrapLocalRef()
 
-            if (ModifyVariableArgsOnlyInspection.shouldReport(localAnnotation, localType, targets)) {
+            if (ModifyVariableArgsOnlyInspection.shouldReport(localAnnotation, localType, targets.asSequence())) {
                 holder.registerProblem(
                     localAnnotation.nameReferenceElement ?: localAnnotation,
                     "@Local may be argsOnly = true",

src/main/kotlin/translations/DeprecatedTranslations.kt

@@ -0,0 +1,111 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2025 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.translations
+
+import com.google.gson.JsonParser
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.OrderEnumerator
+import com.intellij.openapi.roots.ProjectRootModificationTracker
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.util.CachedValueProvider
+import com.intellij.psi.util.CachedValuesManager
+import java.io.InputStreamReader
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+
+class DeprecatedTranslations private constructor(val removed: Set<String>, val renamed: Map<String, String>) {
+    val inverseRenamed = renamed.entries.associateBy({ it.value }) { it.key }
+
+    val isEmpty
+        get() = removed.isEmpty() && renamed.isEmpty()
+
+    companion object {
+        private val DEFAULT = DeprecatedTranslations(emptySet(), emptyMap())
+        private const val FILE_PATH = "assets/minecraft/lang/deprecated.json"
+
+        fun getInstance(project: Project): DeprecatedTranslations {
+            return CachedValuesManager.getManager(project).getCachedValue(project) {
+                val file = findFile(project) ?: return@getCachedValue CachedValueProvider.Result(
+                    DEFAULT,
+                    ProjectRootModificationTracker.getInstance(project)
+                )
+                CachedValueProvider.Result(getInstanceFromFile(file), file)
+            }
+        }
+
+        private fun findFile(project: Project): VirtualFile? {
+            for (libraryRoot in OrderEnumerator.orderEntries(project).librariesOnly().classes().roots) {
+                val file = libraryRoot.findFileByRelativePath(FILE_PATH) ?: continue
+                if (!file.isDirectory) {
+                    return file
+                }
+            }
+
+            return null
+        }
+
+        private fun getInstanceFromFile(file: VirtualFile): DeprecatedTranslations {
+            try {
+                val rootElement = InputStreamReader(file.inputStream, StandardCharsets.UTF_8).use { reader ->
+                     JsonParser.parseReader(reader)
+                }
+
+                if (rootElement == null || !rootElement.isJsonObject) {
+                    return DEFAULT
+                }
+
+                val obj = rootElement.asJsonObject
+
+                val removedElt = obj.get("removed")
+                val removed = if (removedElt != null && removedElt.isJsonArray) {
+                    val removedArr = removedElt.asJsonArray
+                    removedArr.mapNotNullTo(HashSet.newHashSet(removedArr.size())) { e ->
+                        if (e.isJsonPrimitive && e.asJsonPrimitive.isString) {
+                            e.asString
+                        } else {
+                            null
+                        }
+                    }
+                } else {
+                    emptySet()
+                }
+
+                val renamedElt = obj.get("renamed")
+                val renamed = if (renamedElt != null && renamedElt.isJsonObject) {
+                    val renamedObj = renamedElt.asJsonObject
+                    renamedObj.asMap().asSequence().mapNotNull { (k, v) ->
+                        if (v.isJsonPrimitive && v.asJsonPrimitive.isString) {
+                            k to v.asString
+                        } else {
+                            null
+                        }
+                    }.toMap(HashMap.newHashMap(renamedObj.size()))
+                } else {
+                    emptyMap()
+                }
+
+                return DeprecatedTranslations(removed, renamed)
+            } catch (_: IOException) {
+                return DEFAULT
+            }
+        }
+    }
+}

src/main/kotlin/translations/TranslationFiles.kt

@@ -238,9 +238,6 @@ object TranslationFiles {
                 is FileEntry.Comment -> result.append("# ${entry.text}\n")
                 is FileEntry.Translation -> result.append("${entry.key}=${entry.text}\n")
                 FileEntry.EmptyLine -> result.append('\n')
-                // TODO: IntelliJ shows a false error here without the `else`. The compiler doesn't care because
-                //  FileEntry is a sealed class. When this bug in IntelliJ is fixed, remove this `else`.
-                else -> {}
             }
         }
 
@@ -282,9 +279,6 @@ object TranslationFiles {
                     result.append("\"${StringUtil.escapeStringCharacters(entry.text)}\",\n")
                 }
                 FileEntry.EmptyLine -> result.append('\n')
-                // TODO: IntelliJ shows a false error here without the `else`. The compiler doesn't care because
-                //  FileEntry is a sealed class. When this bug in IntelliJ is fixed, remove this `else`.
-                else -> {}
             }
         }