User: rednesto
Date: 25 Sep 22 09:33
Revision: 0b4be1f421fea06588a6f184e184cffa13352e68
Summary:
Fix deprecation warnings


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

Index: src/main/kotlin/creator/MinecraftModuleBuilder.kt
===================================================================
--- src/main/kotlin/creator/MinecraftModuleBuilder.kt	(revision ce7cdc9c4af376592ab404213c8506ea1bbfb02a)
+++ src/main/kotlin/creator/MinecraftModuleBuilder.kt	(revision 0b4be1f421fea06588a6f184e184cffa13352e68)
@@ -79,7 +79,7 @@
         }
 
         if (!project.isInitialized) {
-            StartupManager.getInstance(project).registerPostStartupActivity(r)
+            StartupManager.getInstance(project).runAfterOpened(r)
             return
         }
 
Index: src/main/kotlin/platform/forge/inspections/sideonly/RemoveAnnotationInspectionGadgetsFix.kt
===================================================================
--- src/main/kotlin/platform/forge/inspections/sideonly/RemoveAnnotationInspectionGadgetsFix.kt	(revision ce7cdc9c4af376592ab404213c8506ea1bbfb02a)
+++ src/main/kotlin/platform/forge/inspections/sideonly/RemoveAnnotationInspectionGadgetsFix.kt	(revision 0b4be1f421fea06588a6f184e184cffa13352e68)
@@ -13,16 +13,17 @@
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiAnnotation
-import com.intellij.structuralsearch.plugin.util.SmartPsiPointer
+import com.intellij.psi.SmartPsiElementPointer
+import com.intellij.refactoring.suggested.createSmartPointer
 import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class RemoveAnnotationInspectionGadgetsFix(element: PsiAnnotation, private val name: String) : InspectionGadgetsFix() {
 
-    private val pointer: SmartPsiPointer = SmartPsiPointer(element)
+    private val pointer: SmartPsiElementPointer<PsiAnnotation> = element.createSmartPointer()
 
     override fun doFix(project: Project, descriptor: ProblemDescriptor) {
-        (pointer.element as? PsiAnnotation)?.delete()
+        pointer.element?.delete()
     }
 
     @Nls
Index: src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt
===================================================================
--- src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt	(revision ce7cdc9c4af376592ab404213c8506ea1bbfb02a)
+++ src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt	(revision 0b4be1f421fea06588a6f184e184cffa13352e68)
@@ -14,15 +14,16 @@
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClass
-import com.intellij.structuralsearch.plugin.util.SmartPsiPointer
+import com.intellij.psi.SmartPsiElementPointer
+import com.intellij.refactoring.suggested.createSmartPointer
 import com.siyeh.ig.InspectionGadgetsFix
 
 class AddEmptyConstructorInspectionGadgetsFix(element: PsiClass, private val name: String) : InspectionGadgetsFix() {
 
-    private val pointer: SmartPsiPointer = SmartPsiPointer(element)
+    private val pointer: SmartPsiElementPointer<PsiClass> = element.createSmartPointer()
 
     override fun doFix(project: Project, descriptor: ProblemDescriptor?) {
-        val clazz = pointer.element as? PsiClass ?: return
+        val clazz = pointer.element ?: return
         clazz.addBefore(JavaPsiFacade.getElementFactory(project).createConstructor(), clazz.methods[0])
     }
 
Index: src/main/kotlin/util/utils.kt
===================================================================
--- src/main/kotlin/util/utils.kt	(revision ce7cdc9c4af376592ab404213c8506ea1bbfb02a)
+++ src/main/kotlin/util/utils.kt	(revision 0b4be1f421fea06588a6f184e184cffa13352e68)
@@ -218,7 +218,7 @@
             }
 
             val path = manager.getModuleGroupPath(m) ?: continue
-            val namedModule = path.last()?.let { manager.findModuleByName(it) } ?: continue
+            val namedModule = manager.findModuleByName(path.last()) ?: continue
 
             if (namedModule != this) {
                 continue