User: rednesto
Date: 16 Jul 23 20:52
Revision: a43952bab84dac83fd7db78ee3dc98ccca8ad93b
Summary:
Merge branch '2022.2' into 2022.3


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

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 2ddc23e42c36d1fbeab715377c9b0537156a4dfb)
+++ gradle.properties	(revision a43952bab84dac83fd7db78ee3dc98ccca8ad93b)
@@ -24,7 +24,7 @@
 ideaVersion = 2022.3
 ideaVersionName = 2022.3
 
-coreVersion = 1.6.7
+coreVersion = 1.6.8
 downloadIdeaSources = true
 
 pluginTomlVersion = 223.7571.59
Index: src/main/kotlin/platform/architectury/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision 2ddc23e42c36d1fbeab715377c9b0537156a4dfb)
+++ src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision a43952bab84dac83fd7db78ee3dc98ccca8ad93b)
@@ -26,6 +26,7 @@
 import com.demonwav.mcdev.creator.step.AbstractMcVersionChainStep
 import com.demonwav.mcdev.creator.step.AuthorsStep
 import com.demonwav.mcdev.creator.step.DescriptionStep
+import com.demonwav.mcdev.creator.step.ForgeStyleModIdStep
 import com.demonwav.mcdev.creator.step.IssueTrackerStep
 import com.demonwav.mcdev.creator.step.LicenseStep
 import com.demonwav.mcdev.creator.step.ModNameStep
@@ -74,6 +75,7 @@
     override fun createStep(data: ArchitecturyVersionData): NewProjectWizardStep {
         return ArchitecturyVersionChainStep(this, data)
             .nextStep(::UseMixinsStep)
+            .nextStep(::ForgeStyleModIdStep)
             .nextStep(::ModNameStep)
             .nextStep(::LicenseStep)
             .nextStep(::ArchitecturyOptionalSettingsStep)
Index: src/main/kotlin/platform/fabric/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/fabric/creator/ui-steps.kt	(revision 2ddc23e42c36d1fbeab715377c9b0537156a4dfb)
+++ src/main/kotlin/platform/fabric/creator/ui-steps.kt	(revision a43952bab84dac83fd7db78ee3dc98ccca8ad93b)
@@ -27,6 +27,7 @@
 import com.demonwav.mcdev.creator.step.AuthorsStep
 import com.demonwav.mcdev.creator.step.DescriptionStep
 import com.demonwav.mcdev.creator.step.LicenseStep
+import com.demonwav.mcdev.creator.step.ModIdStep
 import com.demonwav.mcdev.creator.step.ModNameStep
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.RepositoryStep
@@ -74,6 +75,7 @@
         return FabricVersionChainStep(this, fabricVersions, apiVersions)
             .nextStep(::FabricEnvironmentStep)
             .nextStep(::UseMixinsStep)
+            .nextStep(::ModIdStep)
             .nextStep(::ModNameStep)
             .nextStep(::LicenseStep)
             .nextStep(::FabricOptionalSettingsStep)
Index: src/main/kotlin/platform/mixin/util/AsmUtil.kt
===================================================================
--- src/main/kotlin/platform/mixin/util/AsmUtil.kt	(revision 2ddc23e42c36d1fbeab715377c9b0537156a4dfb)
+++ src/main/kotlin/platform/mixin/util/AsmUtil.kt	(revision a43952bab84dac83fd7db78ee3dc98ccca8ad93b)
@@ -128,7 +128,8 @@
 }
 
 fun Type.toPsiType(elementFactory: PsiElementFactory, context: PsiElement? = null): PsiType {
-    return elementFactory.createTypeFromText(className.replace('$', '.'), context)
+    val javaClassName = className.replace("(\\$)(\\D)".toRegex()) { "." + it.groupValues[2] }
+    return elementFactory.createTypeFromText(javaClassName, context)
 }
 
 private fun hasAccess(access: Int, flag: Int) = (access and flag) != 0
@@ -719,7 +720,7 @@
             val simpleName = clazz?.name?.substringAfterLast('/')
             if (simpleName != null) {
                 name = simpleName.substringAfterLast('$')
-                while (!name[0].isJavaIdentifierStart()) {
+                while (name.isNotEmpty() && !name[0].isJavaIdentifierStart()) {
                     val dollarIndex = simpleName.lastIndexOf('$', simpleName.length - name.length - 2)
                     if (dollarIndex == -1) {
                         name = simpleName