User: kyle wood
Date: 17 Nov 23 07:24
Revision: cfbaebd84310ef3d45b3776d64ec9b12a707c083
Summary:
Merge branch '2022.3' into 2023.1


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8834&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision b29af869bf0aad4270f80f00b53731a9f2756942)
+++ build.gradle.kts	(revision cfbaebd84310ef3d45b3776d64ec9b12a707c083)
@@ -29,12 +29,12 @@
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "1.9.20"
     java
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.15.0"
+    id("org.jetbrains.intellij") version "1.16.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
Index: gradle.properties
===================================================================
--- gradle.properties	(revision b29af869bf0aad4270f80f00b53731a9f2756942)
+++ gradle.properties	(revision cfbaebd84310ef3d45b3776d64ec9b12a707c083)
@@ -24,7 +24,7 @@
 ideaVersion = 2023.1
 ideaVersionName = 2023.1
 
-coreVersion = 1.6.10
+coreVersion = 1.6.11
 downloadIdeaSources = true
 
 pluginTomlVersion = 231.8109.1
Index: src/main/kotlin/insight/ColorUtil.kt
===================================================================
--- src/main/kotlin/insight/ColorUtil.kt	(revision b29af869bf0aad4270f80f00b53731a9f2756942)
+++ src/main/kotlin/insight/ColorUtil.kt	(revision cfbaebd84310ef3d45b3776d64ec9b12a707c083)
@@ -79,7 +79,7 @@
     val facet = MinecraftFacet.getInstance(module) ?: return null
     val resolvedName = expression.resolvedName ?: return null
     for (abstractModuleType in facet.types) {
-        val map = abstractModuleType.classToColorMappings
+        val map = abstractModuleType.classToColorMappings(module)
         for (entry in map.entries) {
             // This is such a hack
             // Okay, type will be the fully-qualified class, but it will exclude the actual enum
Index: src/main/kotlin/platform/mcp/actions/GotoAtEntryAction.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/GotoAtEntryAction.kt	(revision b29af869bf0aad4270f80f00b53731a9f2756942)
+++ src/main/kotlin/platform/mcp/actions/GotoAtEntryAction.kt	(revision cfbaebd84310ef3d45b3776d64ec9b12a707c083)
@@ -22,7 +22,7 @@
 
 import com.demonwav.mcdev.facet.MinecraftFacet
 import com.demonwav.mcdev.platform.mcp.McpModuleType
-import com.demonwav.mcdev.platform.mcp.srg.SrgManager
+import com.demonwav.mcdev.platform.mcp.mappings.MappingsManager
 import com.demonwav.mcdev.platform.mixin.handlers.ShadowHandler
 import com.demonwav.mcdev.util.ActionData
 import com.demonwav.mcdev.util.getDataFromActionEvent
@@ -50,12 +50,12 @@
             return
         }
 
-        val srgManager = data.instance.getModuleOfType(McpModuleType)?.srgManager
+        val mappingsManager = data.instance.getModuleOfType(McpModuleType)?.mappingsManager
             // Not all ATs are in MCP modules, fallback to this if possible
             // TODO try to find SRG references for all modules if current module isn't found?
-            ?: SrgManager.findAnyInstance(data.project) ?: return showBalloon(e)
+            ?: MappingsManager.findAnyInstance(data.project) ?: return showBalloon(e)
 
-        srgManager.srgMap.onSuccess { srgMap ->
+        mappingsManager.mappings.onSuccess { srgMap ->
             var parent = data.element.parent
 
             if (parent is PsiMember) {
@@ -67,11 +67,11 @@
 
             when (parent) {
                 is PsiField -> {
-                    val reference = srgMap.getSrgField(parent) ?: parent.simpleQualifiedMemberReference
+                    val reference = srgMap.getIntermediaryField(parent) ?: parent.simpleQualifiedMemberReference
                     searchForText(e, data, reference.name)
                 }
                 is PsiMethod -> {
-                    val reference = srgMap.getSrgMethod(parent) ?: parent.qualifiedMemberReference
+                    val reference = srgMap.getIntermediaryMethod(parent) ?: parent.qualifiedMemberReference
                     searchForText(e, data, reference.name + reference.descriptor)
                 }
                 else ->
Index: src/main/kotlin/platform/mcp/actions/SrgActionBase.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision b29af869bf0aad4270f80f00b53731a9f2756942)
+++ src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision cfbaebd84310ef3d45b3776d64ec9b12a707c083)
@@ -21,7 +21,7 @@
 package com.demonwav.mcdev.platform.mcp.actions
 
 import com.demonwav.mcdev.platform.mcp.McpModuleType
-import com.demonwav.mcdev.platform.mcp.srg.McpSrgMap
+import com.demonwav.mcdev.platform.mcp.mappings.Mappings
 import com.demonwav.mcdev.platform.mixin.handlers.ShadowHandler
 import com.demonwav.mcdev.util.ActionData
 import com.demonwav.mcdev.util.getDataFromActionEvent
@@ -55,7 +55,7 @@
 
         val mcpModule = data.instance.getModuleOfType(McpModuleType) ?: return showBalloon("No mappings found", e)
 
-        mcpModule.srgManager?.srgMap?.onSuccess { srgMap ->
+        mcpModule.mappingsManager?.mappings?.onSuccess { srgMap ->
             var parent = data.element.parent ?: return@onSuccess showBalloon("Not a valid element", e)
 
             if (parent is PsiMember) {
@@ -75,7 +75,7 @@
         } ?: showBalloon("No mappings found", e)
     }
 
-    abstract fun withSrgTarget(parent: PsiElement, srgMap: McpSrgMap, e: AnActionEvent, data: ActionData)
+    abstract fun withSrgTarget(parent: PsiElement, srgMap: Mappings, e: AnActionEvent, data: ActionData)
 
     companion object {
         fun showBalloon(message: String, e: AnActionEvent) {