User: rednesto
Date: 08 Jul 23 22:17
Revision: d78fb0f535d2069d5a5a14f8af3094dc7075bfe9
Summary:
Merge branch '2022.3' into 2023.1

# Conflicts:
#	src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 091e7c21d4e14362ebeb8d7073a7b7d8957a9bbe)
+++ build.gradle.kts	(revision d78fb0f535d2069d5a5a14f8af3094dc7075bfe9)
@@ -28,12 +28,12 @@
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "1.9.0"
     java
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.14.1"
+    id("org.jetbrains.intellij") version "1.15.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
@@ -281,7 +281,7 @@
 
     exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java")
 
-    tasks {
+    this.tasks {
         register("gradle") {
             files.from(
                 fileTree(project.projectDir) {
Index: src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt
===================================================================
--- src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision 091e7c21d4e14362ebeb8d7073a7b7d8957a9bbe)
+++ src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision d78fb0f535d2069d5a5a14f8af3094dc7075bfe9)
@@ -51,7 +51,7 @@
 abstract class FixedAssetsNewProjectWizardStep(parent: NewProjectWizardStep) : AbstractNewProjectWizardStep(parent) {
     lateinit var outputDirectory: String
     private val assets = arrayListOf<FixedGeneratorAsset>()
-    val templateProperties = hashMapOf<String, Any>()
+    val templateProperties = hashMapOf<String, Any?>()
     private val filesToOpen = hashSetOf<String>()
 
     fun addAssets(vararg assets: Any) = addAssets(assets.toList())
@@ -66,9 +66,9 @@
         }
     }
 
-    fun addTemplateProperties(vararg properties: Pair<String, Any>) = addTemplateProperties(properties.toMap())
+    fun addTemplateProperties(vararg properties: Pair<String, Any?>) = addTemplateProperties(properties.toMap())
 
-    fun addTemplateProperties(properties: Map<String, Any>) = templateProperties.putAll(properties)
+    fun addTemplateProperties(properties: Map<String, Any?>) = templateProperties.putAll(properties)
 
     fun addFilesToOpen(vararg relativeCanonicalPaths: String) = addFilesToOpen(relativeCanonicalPaths.toList())
 
Index: src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt	(revision 091e7c21d4e14362ebeb8d7073a7b7d8957a9bbe)
+++ src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt	(revision d78fb0f535d2069d5a5a14f8af3094dc7075bfe9)
@@ -36,6 +36,7 @@
 import com.intellij.psi.PsiMethodReferenceExpression
 import com.intellij.psi.PsiReturnStatement
 import com.intellij.psi.PsiTypes
+import com.intellij.psi.controlFlow.AnalysisCanceledException
 import com.intellij.psi.controlFlow.ControlFlowUtil
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
@@ -113,7 +114,12 @@
             }
 
             val rBrace = codeBlockToAnalyze.rBrace ?: return
-            val controlFlow = HighlightControlFlowUtil.getControlFlowNoConstantEvaluate(codeBlockToAnalyze)
+            val controlFlow = try {
+                HighlightControlFlowUtil.getControlFlowNoConstantEvaluate(codeBlockToAnalyze)
+            } catch (e: AnalysisCanceledException) {
+                return
+            }
+
             if (ControlFlowUtil.canCompleteNormally(controlFlow, 0, controlFlow.size)) {
                 if (tailOnly) {
                     result.clear()
Index: src/main/kotlin/platform/velocity/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/velocity/creator/gradle-steps.kt	(revision 091e7c21d4e14362ebeb8d7073a7b7d8957a9bbe)
+++ src/main/kotlin/platform/velocity/creator/gradle-steps.kt	(revision d78fb0f535d2069d5a5a14f8af3094dc7075bfe9)
@@ -79,7 +79,11 @@
             "PACKAGE" to mainPackage,
         )
 
-        val buildConstantsJava = "src/main/templates/${mainPackage.replace('.', '/')}/BuildConstants.java"
+        val buildConstantsJava = if (mainPackage != null) {
+            "src/main/templates/${mainPackage.replace('.', '/')}/BuildConstants.java"
+        } else {
+            "src/main/templates/BuildConstants.java"
+        }
         assets.addTemplates(
             project,
             "build.gradle" to MinecraftTemplates.VELOCITY_BUILD_GRADLE_TEMPLATE,
Index: src/main/kotlin/util/utils.kt
===================================================================
--- src/main/kotlin/util/utils.kt	(revision 091e7c21d4e14362ebeb8d7073a7b7d8957a9bbe)
+++ src/main/kotlin/util/utils.kt	(revision d78fb0f535d2069d5a5a14f8af3094dc7075bfe9)
@@ -378,3 +378,11 @@
 
 fun <T : Throwable> withSuppressed(original: T?, other: T): T =
     original?.apply { addSuppressed(other) } ?: other
+
+fun <S : CharSequence, R> S.ifNotBlank(block: (S) -> R): R? {
+    if (this.isNotBlank()) {
+        return block(this)
+    }
+
+    return null
+}