User: kyle wood
Date: 17 Nov 23 07:30
Revision: b1ed1836b23c375cef20ccbb5bbc845a7e0825cc
Summary:
Merge branch '2023.2' into 2023.3


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision bd54763c7c2fd5257e7e618337dacdf4ec86b8f4)
+++ build.gradle.kts	(revision b1ed1836b23c375cef20ccbb5bbc845a7e0825cc)
@@ -29,12 +29,12 @@
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
-    kotlin("jvm") version "1.9.10"
+    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 bd54763c7c2fd5257e7e618337dacdf4ec86b8f4)
+++ gradle.properties	(revision b1ed1836b23c375cef20ccbb5bbc845a7e0825cc)
@@ -24,7 +24,7 @@
 ideaVersion = 233.11555.11-EAP-SNAPSHOT
 ideaVersionName = 2023.3
 
-coreVersion = 1.6.10
+coreVersion = 1.6.11
 downloadIdeaSources = true
 
 pluginTomlVersion = 233.11555.11
Index: src/main/kotlin/facet/MinecraftFacet.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacet.kt	(revision bd54763c7c2fd5257e7e618337dacdf4ec86b8f4)
+++ src/main/kotlin/facet/MinecraftFacet.kt	(revision b1ed1836b23c375cef20ccbb5bbc845a7e0825cc)
@@ -115,6 +115,7 @@
             }
 
         newlyEnabled.forEach(AbstractModule::init)
+        modules.forEach(AbstractModule::refresh)
 
         ProjectView.getInstance(module.project).refresh()
     }
Index: src/main/kotlin/platform/AbstractModuleType.kt
===================================================================
--- src/main/kotlin/platform/AbstractModuleType.kt	(revision bd54763c7c2fd5257e7e618337dacdf4ec86b8f4)
+++ src/main/kotlin/platform/AbstractModuleType.kt	(revision b1ed1836b23c375cef20ccbb5bbc845a7e0825cc)
@@ -25,6 +25,7 @@
 import com.demonwav.mcdev.util.findContainingClass
 import com.intellij.codeInspection.ex.EntryPointsManager
 import com.intellij.codeInspection.ex.EntryPointsManagerBase
+import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
@@ -51,8 +52,7 @@
 
     abstract val listenerAnnotations: List<String>
 
-    val classToColorMappings: Map<String, Color>
-        get() = this.colorMap
+    open fun classToColorMappings(module: Module): Map<String, Color> = this.colorMap
 
     abstract fun generateModule(facet: MinecraftFacet): T
 
Index: src/main/kotlin/platform/mcp/actions/SrgActionBase.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision bd54763c7c2fd5257e7e618337dacdf4ec86b8f4)
+++ src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision b1ed1836b23c375cef20ccbb5bbc845a7e0825cc)
@@ -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) {