User: joe
Date: 19 Dec 25 21:15
Revision: f42c39cfdff95cd0e6ea06d76fb37096db0dd0af
Summary:
Merge branch '2024.3' into 2025.1


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10353&personal=false

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 2cd4ca4ba0b4463ea1f4148b0d978872a860d319)
+++ gradle.properties	(revision f42c39cfdff95cd0e6ea06d76fb37096db0dd0af)
@@ -23,7 +23,7 @@
 
 ideaVersionName = 2025.1
 
-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
Index: src/main/kotlin/util/psi-utils.kt
===================================================================
--- src/main/kotlin/util/psi-utils.kt	(revision 2cd4ca4ba0b4463ea1f4148b0d978872a860d319)
+++ src/main/kotlin/util/psi-utils.kt	(revision f42c39cfdff95cd0e6ea06d76fb37096db0dd0af)
@@ -349,7 +349,7 @@
     }
 
 fun PsiElement.findMcpModule() = this.cached {
-    val file = containingFile?.virtualFile ?: return@cached null
+    val file = containingFile?.viewProvider?.virtualFile ?: return@cached null
     val index = ProjectFileIndex.getInstance(project)
     val modules = if (index.isInLibrary(file)) {
         val library = index.getOrderEntriesForFile(file)
@@ -379,7 +379,7 @@
 val PsiElement.mcVersion: SemanticVersion?
     get() = this.cached {
         findMcpModule()?.let {
-            SemanticVersion.parse(it.getSettings().minecraftVersion ?: return@let null)
+            SemanticVersion.tryParse(it.getSettings().minecraftVersion ?: return@let null)
         }
     }