Skip to content

Commit 367aa7a

Browse files
committed
Make usesSrgMemberNames return Boolean?
1 parent 1de6c0e commit 367aa7a

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CopyNeoForgeAtAction : AnAction() {
4949

5050
private fun isAvailable(e: AnActionEvent): Boolean {
5151
val data = getDataFromActionEvent(e) ?: return false
52-
return !data.instance.usesSrgMemberNames()
52+
return data.instance.usesSrgMemberNames() == false
5353
}
5454

5555
override fun actionPerformed(e: AnActionEvent) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ abstract class AtClassMemberReference<E : AtElement>(element: E, range: TextRang
175175

176176
val module = element.findModule() ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
177177
val instance = MinecraftFacet.getInstance(module) ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
178-
val useSrg = instance.usesSrgMemberNames()
178+
val useSrg = instance.usesSrgMemberNames() == true
179179
val (mapField, mapMethod) = if (!useSrg) {
180180
{ it: PsiField -> it.memberReference } to { it: PsiMethod -> it.memberReference }
181181
} else {
@@ -234,7 +234,7 @@ class AtFieldNameReference(element: AtFieldName) :
234234
val instance = MinecraftFacet.getInstance(module) ?: return null
235235
val mcpModule = instance.getModuleOfType(McpModuleType) ?: return null
236236

237-
return if (!instance.usesSrgMemberNames()) {
237+
return if (instance.usesSrgMemberNames() != true) {
238238
entryClass.findFieldByName(element.text, false)
239239
} else {
240240
val srgMap = mcpModule.mappingsManager?.mappingsNow ?: return null
@@ -272,7 +272,7 @@ class AtFuncNameReference(element: AtFunction) :
272272
val instance = MinecraftFacet.getInstance(module) ?: return null
273273
val mcpModule = instance.getModuleOfType(McpModuleType) ?: return null
274274

275-
return if (!instance.usesSrgMemberNames()) {
275+
return if (instance.usesSrgMemberNames() != true) {
276276
val memberReference = MemberReference.parse(element.text) ?: return null
277277
entryClass.findMethods(memberReference).firstOrNull()
278278
} else {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@
2121
package com.demonwav.mcdev.platform.mcp.at
2222

2323
import com.demonwav.mcdev.facet.MinecraftFacet
24+
import com.demonwav.mcdev.platform.forge.ForgeModuleType
2425
import com.demonwav.mcdev.platform.mcp.McpModuleType
2526
import com.demonwav.mcdev.platform.neoforge.NeoForgeModuleType
2627
import com.demonwav.mcdev.util.MinecraftVersions
2728
import com.demonwav.mcdev.util.SemanticVersion
2829

29-
fun MinecraftFacet.usesSrgMemberNames(): Boolean {
30+
fun MinecraftFacet.usesSrgMemberNames(): Boolean? {
3031
if (!this.isOfType(NeoForgeModuleType)) {
31-
return true
32+
return this.isOfType(ForgeModuleType)
3233
}
3334

34-
val mcpModule = this.getModuleOfType(McpModuleType) ?: return true
35-
val mcVersion = mcpModule.getSettings().minecraftVersion?.let(SemanticVersion::tryParse) ?: return true
35+
val mcpModule = this.getModuleOfType(McpModuleType) ?: return null
36+
val mcVersion = mcpModule.getSettings().minecraftVersion?.let(SemanticVersion::tryParse) ?: return null
3637
return mcVersion < MinecraftVersions.MC1_20_2
3738
}

0 commit comments

Comments
 (0)