Small cleanup

Author: RedNesto

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

@@ -20,13 +20,10 @@
 
 package com.demonwav.mcdev.platform.mcp.actions
 
-import com.demonwav.mcdev.platform.mcp.McpModuleType
 import com.demonwav.mcdev.platform.mcp.actions.SrgActionBase.Companion.showBalloon
 import com.demonwav.mcdev.platform.mcp.actions.SrgActionBase.Companion.showSuccessBalloon
+import com.demonwav.mcdev.platform.mcp.at.usesSrgMemberNames
 import com.demonwav.mcdev.platform.mixin.handlers.ShadowHandler
-import com.demonwav.mcdev.platform.neoforge.NeoForgeModuleType
-import com.demonwav.mcdev.util.MinecraftVersions
-import com.demonwav.mcdev.util.SemanticVersion
 import com.demonwav.mcdev.util.descriptor
 import com.demonwav.mcdev.util.getDataFromActionEvent
 import com.intellij.openapi.actionSystem.ActionUpdateThread
@@ -52,13 +49,7 @@ class CopyNeoForgeAtAction : AnAction() {
 
     private fun isAvailable(e: AnActionEvent): Boolean {
         val data = getDataFromActionEvent(e) ?: return false
-        if (!data.instance.isOfType(NeoForgeModuleType)) {
-            return false
-        }
-
-        val mcpModule = data.instance.getModuleOfType(McpModuleType) ?: return false
-        val mcVersion = mcpModule.getSettings().minecraftVersion?.let(SemanticVersion::tryParse) ?: return false
-        return mcVersion >= MinecraftVersions.MC1_20_2
+        return !data.instance.usesSrgMemberNames()
     }
 
     override fun actionPerformed(e: AnActionEvent) {

src/main/kotlin/platform/mcp/at/AtReferenceContributor.kt

@@ -27,10 +27,7 @@ import com.demonwav.mcdev.platform.mcp.at.gen.psi.AtEntry
 import com.demonwav.mcdev.platform.mcp.at.gen.psi.AtFieldName
 import com.demonwav.mcdev.platform.mcp.at.gen.psi.AtFunction
 import com.demonwav.mcdev.platform.mcp.at.psi.AtElement
-import com.demonwav.mcdev.platform.neoforge.NeoForgeModuleType
 import com.demonwav.mcdev.util.MemberReference
-import com.demonwav.mcdev.util.MinecraftVersions
-import com.demonwav.mcdev.util.SemanticVersion
 import com.demonwav.mcdev.util.findMethods
 import com.demonwav.mcdev.util.findModule
 import com.demonwav.mcdev.util.findQualifiedClass
@@ -177,12 +174,12 @@ abstract class AtClassMemberReference<E : AtElement>(element: E, range: TextRang
         val entry = element.parent as? AtEntry ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
 
         val module = element.findModule() ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
-        val instance = MinecraftFacet.getInstance(module)
-        val mcpModule = instance?.getModuleOfType(McpModuleType) ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
-        val isNeoForge = instance.isOfType(NeoForgeModuleType)
-        val (mapField, mapMethod) = if (isNeoForge) {
+        val instance = MinecraftFacet.getInstance(module) ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
+        val useSrg = instance.usesSrgMemberNames()
+        val (mapField, mapMethod) = if (!useSrg) {
             { it: PsiField -> it.memberReference } to { it: PsiMethod -> it.memberReference }
         } else {
+            val mcpModule = instance.getModuleOfType(McpModuleType)!!
             val srgMap = mcpModule.mappingsManager?.mappingsNow ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
             { it: PsiField -> srgMap.getIntermediaryField(it) } to { it: PsiMethod -> srgMap.getIntermediaryMethod(it) }
         }
@@ -197,8 +194,8 @@ abstract class AtClassMemberReference<E : AtElement>(element: E, range: TextRang
                 .withPsiElement(field)
                 .withPresentableText(field.name)
                 .withIcon(PlatformIcons.FIELD_ICON)
-                .withTailText(" (${memberReference.name})".takeUnless { isNeoForge }, true)
-                .withInsertHandler(AtClassMemberInsertionHandler(field.name.takeUnless { isNeoForge }))
+                .withTailText(" (${memberReference.name})".takeIf { useSrg }, true)
+                .withInsertHandler(AtClassMemberInsertionHandler(field.name.takeIf { useSrg }))
             results.add(PrioritizedLookupElement.withPriority(lookupElement, 1.0))
         }
 
@@ -209,8 +206,8 @@ abstract class AtClassMemberReference<E : AtElement>(element: E, range: TextRang
                 .withPsiElement(method)
                 .withPresentableText(method.nameAndParameterTypes)
                 .withIcon(PlatformIcons.METHOD_ICON)
-                .withTailText(" (${memberReference.name})".takeUnless { isNeoForge }, true)
-                .withInsertHandler(AtClassMemberInsertionHandler(method.name.takeUnless { isNeoForge }))
+                .withTailText(" (${memberReference.name})".takeIf { useSrg }, true)
+                .withInsertHandler(AtClassMemberInsertionHandler(method.name.takeIf { useSrg }))
             results.add(PrioritizedLookupElement.withPriority(lookupElement, 0.0))
         }
 
@@ -237,10 +234,7 @@ class AtFieldNameReference(element: AtFieldName) :
         val instance = MinecraftFacet.getInstance(module) ?: return null
         val mcpModule = instance.getModuleOfType(McpModuleType) ?: return null
 
-        return if (instance.isOfType(NeoForgeModuleType) &&
-            mcpModule.getSettings().minecraftVersion?.let(SemanticVersion::tryParse)
-                ?.let { it >= MinecraftVersions.MC1_20_2 } == true
-        ) {
+        return if (!instance.usesSrgMemberNames()) {
             entryClass.findFieldByName(element.text, false)
         } else {
             val srgMap = mcpModule.mappingsManager?.mappingsNow ?: return null
@@ -278,10 +272,7 @@ class AtFuncNameReference(element: AtFunction) :
         val instance = MinecraftFacet.getInstance(module) ?: return null
         val mcpModule = instance.getModuleOfType(McpModuleType) ?: return null
 
-        return if (instance.isOfType(NeoForgeModuleType) &&
-            mcpModule.getSettings().minecraftVersion?.let(SemanticVersion::tryParse)
-                ?.let { it >= MinecraftVersions.MC1_20_2 } == true
-        ) {
+        return if (!instance.usesSrgMemberNames()) {
             val memberReference = MemberReference.parse(element.text) ?: return null
             entryClass.findMethods(memberReference).firstOrNull()
         } else {

src/main/kotlin/platform/mcp/at/at-utils.kt

@@ -0,0 +1,37 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2024 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.at
+
+import com.demonwav.mcdev.facet.MinecraftFacet
+import com.demonwav.mcdev.platform.mcp.McpModuleType
+import com.demonwav.mcdev.platform.neoforge.NeoForgeModuleType
+import com.demonwav.mcdev.util.MinecraftVersions
+import com.demonwav.mcdev.util.SemanticVersion
+
+fun MinecraftFacet.usesSrgMemberNames(): Boolean {
+    if (!this.isOfType(NeoForgeModuleType)) {
+        return true
+    }
+
+    val mcpModule = this.getModuleOfType(McpModuleType) ?: return true
+    val mcVersion = mcpModule.getSettings().minecraftVersion?.let(SemanticVersion::tryParse) ?: return true
+    return mcVersion < MinecraftVersions.MC1_20_2
+}