User: joe
Date: 12 Nov 26 05:04
Revision: a81e17474f97f290158224746f544f92e60f4420
Summary:
Slightly less easy internal/deprecation fixes


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

Index: src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -24,7 +24,7 @@
 import com.demonwav.mcdev.creator.storeToData
 import com.demonwav.mcdev.util.SemanticVersion
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
-import com.intellij.ide.wizard.NewProjectWizardBaseData
+import com.intellij.ide.wizard.NewProjectWizardBaseData.Companion.baseData
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.observable.util.bindStorage
 import com.intellij.openapi.ui.validation.CHECK_ARTIFACT_ID
@@ -46,8 +46,7 @@
     SemanticVersion.tryParse(it) == null
 }
 
-class BuildSystemPropertiesStep<ParentStep>(private val parent: ParentStep) : AbstractNewProjectWizardStep(parent)
-    where ParentStep : NewProjectWizardStep, ParentStep : NewProjectWizardBaseData {
+class BuildSystemPropertiesStep(parent: NewProjectWizardStep) : AbstractNewProjectWizardStep(parent) {
 
     val groupIdProperty = propertyGraph.property("org.example")
         .bindStorage("${javaClass.name}.groupId")
@@ -60,11 +59,11 @@
     var version by versionProperty
 
     init {
-        artifactIdProperty.dependsOn(parent.nameProperty, ::suggestArtifactId)
+        artifactIdProperty.dependsOn(baseData!!.nameProperty, ::suggestArtifactId)
         storeToData()
     }
 
-    private fun suggestArtifactId() = parent.name
+    private fun suggestArtifactId() = baseData!!.name
 
     override fun setupUI(builder: Panel) {
         builder.collapsibleGroup(MCDevBundle("creator.ui.group.title")) {
Index: src/main/kotlin/creator/buildsystem/gradle-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/creator/buildsystem/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -207,7 +207,7 @@
         }
 
         val rootDirectory = Path.of(context.projectFileDirectory)
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
 
         // Tell IntelliJ to import this project
         rootDirectory.virtualFileOrError.refresh(false, true)
@@ -243,7 +243,7 @@
     private fun addRunTaskConfiguration(
         project: Project,
         rootDirectory: Path,
-        buildSystemProps: BuildSystemPropertiesStep<*>,
+        buildSystemProps: BuildSystemPropertiesStep,
         task: String,
     ) {
         val gradleType = GradleExternalTaskConfigurationType.getInstance()
Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -72,7 +72,7 @@
     }
 
     protected fun setupCore(model: MavenDomProjectModel) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         model.groupId.value = buildSystemProps.groupId
         model.artifactId.value = buildSystemProps.artifactId
         model.version.value = buildSystemProps.version
@@ -178,13 +178,13 @@
             return
         }
 
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         addRunTaskConfiguration(project, buildSystemProps, "package")
     }
 
     private fun addRunTaskConfiguration(
         project: Project,
-        buildSystemProps: BuildSystemPropertiesStep<*>,
+        buildSystemProps: BuildSystemPropertiesStep,
         task: String,
     ) {
         val mavenConfigFactory = MavenRunConfigurationType.getInstance().configurationFactories.first()
Index: src/main/kotlin/creator/platformtype/PlatformTypeStep.kt
===================================================================
--- src/main/kotlin/creator/platformtype/PlatformTypeStep.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/creator/platformtype/PlatformTypeStep.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -23,7 +23,6 @@
 import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.platformtype.PlatformTypeStep.Factory
 import com.intellij.ide.wizard.AbstractNewProjectWizardMultiStep
-import com.intellij.ide.wizard.NewProjectWizardBaseData
 import com.intellij.ide.wizard.NewProjectWizardMultiStepFactory
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.extensions.ExtensionPointName
@@ -36,13 +35,11 @@
  */
 class PlatformTypeStep private constructor(
     parent: NewProjectWizardStep,
-) : AbstractNewProjectWizardMultiStep<PlatformTypeStep, Factory>(parent, EP_NAME),
-    NewProjectWizardBaseData by parent as NewProjectWizardBaseData {
+) : AbstractNewProjectWizardMultiStep<PlatformTypeStep, Factory>(parent, EP_NAME) {
     companion object {
         val EP_NAME = ExtensionPointName<Factory>("com.demonwav.minecraft-dev.platformTypeWizard")
 
-        fun <P> create(parent: P) where P : NewProjectWizardStep, P : NewProjectWizardBaseData =
-            PlatformTypeStep(parent)
+        fun create(parent: NewProjectWizardStep) = PlatformTypeStep(parent)
     }
 
     override val self = this
Index: src/main/kotlin/creator/step/MainClassStep.kt
===================================================================
--- src/main/kotlin/creator/step/MainClassStep.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/creator/step/MainClassStep.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -38,7 +38,7 @@
 
 class MainClassStep(parent: NewProjectWizardStep) : AbstractNewProjectWizardStep(parent) {
     private fun suggestMainClassName(): String {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
 
         if (buildSystemProps.artifactId.contains('.')) {
             // if the artifact id is invalid, don't confuse ourselves by copying its dots
@@ -54,7 +54,7 @@
     var className by classNameProperty
 
     init {
-        whenStepAvailable<BuildSystemPropertiesStep<*>> { buildSystemStep ->
+        whenStepAvailable<BuildSystemPropertiesStep> { buildSystemStep ->
             classNameProperty.updateWhenChanged(buildSystemStep.groupIdProperty, ::suggestMainClassName)
             classNameProperty.updateWhenChanged(buildSystemStep.artifactIdProperty, ::suggestMainClassName)
         }
Index: src/main/kotlin/platform/architectury/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/asset-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/architectury/creator/asset-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -73,7 +73,7 @@
     override val description = "Adding Architectury project files (phase 1)"
 
     override fun setupAssets(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val useMixins = data.getUserData(UseMixinsStep.KEY) ?: false
         val javaVersion = findStep<JdkProjectSetupFinalizer>().preferredJdk.ordinal
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
@@ -190,7 +190,7 @@
     override val description = "Adding Architectury project files (phase $phase)"
 
     override fun setupAssets(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val useArchApi = data.getUserData(ArchitecturyVersionChainStep.ARCHITECTURY_API_VERSION_KEY) != null
Index: src/main/kotlin/platform/architectury/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/architectury/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -68,7 +68,7 @@
     override fun setupAssets(project: Project) {
         data.putUserData(GRADLE_VERSION_KEY, SemanticVersion.release(8, 4))
 
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val mcVersion = data.getUserData(ArchitecturyVersionChainStep.MC_VERSION_KEY) ?: return
Index: src/main/kotlin/platform/bukkit/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/bukkit/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/bukkit/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -56,7 +56,7 @@
     override val description = "Creating Gradle files"
 
     override fun setupAssets(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val javaVersion = findStep<JdkProjectSetupFinalizer>().preferredJdk.ordinal
         val (manifestPath, _) = data.getUserData(AbstractBukkitPlatformStep.KEY)!!.getManifest()
         assets.addTemplateProperties(
Index: src/main/kotlin/platform/bungeecord/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/bungeecord/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/bungeecord/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -57,7 +57,7 @@
 
     override fun setupAssets(project: Project) {
         val projectName = baseData!!.name
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         assets.addTemplateProperties(
             "PROJECT_NAME" to projectName,
             "GROUP_ID" to buildSystemProps.groupId,
Index: src/main/kotlin/platform/fabric/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/fabric/creator/asset-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/fabric/creator/asset-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -58,7 +58,7 @@
     override val description = "Adding Fabric project files (phase 1)"
 
     override fun setupAssets(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val description = data.getUserData(DescriptionStep.KEY) ?: ""
Index: src/main/kotlin/platform/fabric/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/fabric/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/fabric/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -53,7 +53,7 @@
     override val description = "Creating Gradle files"
 
     override fun setupAssets(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val mcVersion = data.getUserData(FabricVersionChainStep.MC_VERSION_KEY) ?: return
         val yarnVersion = data.getUserData(FabricVersionChainStep.YARN_VERSION_KEY) ?: return
         val loaderVersion = data.getUserData(FabricVersionChainStep.LOADER_VERSION_KEY) ?: return
Index: src/main/kotlin/platform/forge/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/forge/creator/asset-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/forge/creator/asset-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -55,7 +55,7 @@
         val forgeVersion = data.getUserData(ForgeVersionChainStep.FORGE_VERSION_KEY) ?: return
         val mainClass = data.getUserData(MainClassStep.KEY) ?: return
         val (mainPackageName, mainClassName) = splitPackage(mainClass)
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val license = data.getUserData(LicenseStep.KEY) ?: return
@@ -142,7 +142,7 @@
         val useMixins = data.getUserData(UseMixinsStep.KEY) ?: false
         if (useMixins) {
             val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
-            val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+            val buildSystemProps = findStep<BuildSystemPropertiesStep>()
             assets.addTemplateProperties(
                 "PACKAGE_NAME" to "${buildSystemProps.groupId}.$modId.mixin",
                 "MOD_ID" to buildSystemProps.artifactId,
Index: src/main/kotlin/platform/forge/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/forge/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/forge/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -74,7 +74,7 @@
         val forgeVersion = data.getUserData(ForgeVersionChainStep.FORGE_VERSION_KEY) ?: return
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val javaVersion = context.projectJdk?.versionString?.let(JavaVersion::parse)
         val authors = data.getUserData(AuthorsStep.KEY) ?: emptyList()
         val description = data.getUserData(DescriptionStep.KEY) ?: return
Index: src/main/kotlin/platform/minecraft/MinecraftModuleSettings.kt
===================================================================
--- src/main/kotlin/platform/minecraft/MinecraftModuleSettings.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/minecraft/MinecraftModuleSettings.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -59,8 +59,8 @@
 
             // Attempt to find settings on the parent module
             val manager = ModuleManager.getInstance(module.project)
-            val path = manager.getModuleGroupPath(module) ?: return settings
-            val parent = manager.findModuleByName(path.last()) ?: return settings
+            val path = manager.getModuleGrouper(null).getGroupPath(module).ifEmpty { return settings }
+            val parent = manager.findModuleByName(path.joinToString(".")) ?: return settings
 
             val newSettings = parent.getService(MinecraftModuleSettings::class.java) as MinecraftModuleSettings
             if (newSettings.getState().minecraftVersion == null) {
Index: src/main/kotlin/platform/neoforge/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/neoforge/creator/asset-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/neoforge/creator/asset-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -53,7 +53,7 @@
         val forgeVersion = data.getUserData(NeoForgeVersionChainStep.NEOFORGE_VERSION_KEY) ?: return
         val mainClass = data.getUserData(MainClassStep.KEY) ?: return
         val (mainPackageName, mainClassName) = splitPackage(mainClass)
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val license = data.getUserData(LicenseStep.KEY) ?: return
@@ -138,7 +138,7 @@
         val useMixins = data.getUserData(UseMixinsStep.KEY) ?: false
         if (useMixins) {
             val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
-            val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+            val buildSystemProps = findStep<BuildSystemPropertiesStep>()
             assets.addTemplateProperties(
                 "PACKAGE_NAME" to "${buildSystemProps.groupId}.$modId.mixin",
                 "MOD_ID" to buildSystemProps.artifactId,
Index: src/main/kotlin/platform/neoforge/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/neoforge/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/neoforge/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -75,7 +75,7 @@
         val neogradleVersion = data.getUserData(NeoForgeVersionChainStep.NEOGRADLE_VERSION_KEY) ?: return
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val javaVersion = context.projectJdk?.versionString?.let(JavaVersion::parse)
         val authors = data.getUserData(AuthorsStep.KEY) ?: emptyList()
         val description = data.getUserData(DescriptionStep.KEY) ?: return
Index: src/main/kotlin/platform/sponge/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/sponge/creator/asset-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/sponge/creator/asset-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -38,7 +38,7 @@
     override val description = "Creating project files"
 
     override fun setupAssets(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val mainClass = data.getUserData(MainClassStep.KEY) ?: return
         val (packageName, className) = splitPackage(mainClass)
 
Index: src/main/kotlin/platform/sponge/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/sponge/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/sponge/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -64,7 +64,7 @@
     override val description = "Creating Gradle files"
 
     override fun setupAssets(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val javaVersion = findStep<JdkProjectSetupFinalizer>().preferredJdk.ordinal
         val spongeVersion = data.getUserData(SpongeApiVersionStep.KEY) ?: return
         val license = data.getUserData(LicenseStep.KEY) ?: return
Index: src/main/kotlin/platform/velocity/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/velocity/creator/asset-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/velocity/creator/asset-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -93,7 +93,7 @@
     override val description = "Patching main class"
 
     override fun perform(project: Project) {
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val pluginId = data.getUserData(AbstractModIdStep.KEY) ?: return
         val pluginName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val mainClassName = data.getUserData(MainClassStep.KEY) ?: return
Index: src/main/kotlin/platform/velocity/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/velocity/creator/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/platform/velocity/creator/gradle-steps.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -64,7 +64,7 @@
 
     override fun setupAssets(project: Project) {
         val projectName = baseData!!.name
-        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        val buildSystemProps = findStep<BuildSystemPropertiesStep>()
         val javaVersion = findStep<JdkProjectSetupFinalizer>().preferredJdk.ordinal
         val mainClass = data.getUserData(MainClassStep.KEY) ?: return
         val (mainPackage, _) = splitPackage(mainClass)
Index: src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt
===================================================================
--- src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
+++ src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt	(revision a81e17474f97f290158224746f544f92e60f4420)
@@ -45,7 +45,7 @@
 import com.intellij.platform.workspace.jps.entities.LibraryRootTypeId
 import com.intellij.platform.workspace.jps.entities.modifyLibraryEntity
 import com.intellij.platform.workspace.storage.MutableEntityStorage
-import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridge
+import com.intellij.workspaceModel.ide.legacyBridge.findLibraryId
 import org.jetbrains.concurrency.AsyncPromise
 import org.jetbrains.concurrency.Promise
 import org.jetbrains.concurrency.resolvedPromise
@@ -76,13 +76,13 @@
         annotationsLocation: AnnotationsLocation,
         diff: MutableEntityStorage
     ): Boolean {
-        if (library !is LibraryBridge || library.isDisposed) {
+        if (library is LibraryEx && library.isDisposed) {
             return true
         }
 
         val annotationsPath = findAnnotationsPath(false) ?: findAnnotationsPath(true) ?: return false
 
-        val libraryEntity = diff.resolve(library.libraryId) ?: return true
+        val libraryEntity = diff.resolve(findLibraryId(library)) ?: return true
         val vfUrlManager = WorkspaceModel.getInstance(project).getVirtualFileUrlManager()
         val newUrl = annotationsPath.toVirtualFileUrl(vfUrlManager)
         val annotationsRootType = LibraryRootTypeId(AnnotationOrderRootType.ANNOTATIONS_ID)