User: joe
Date: 26 Feb 23 11:39
Revision: 92bf71d394d49d566a4ec9ce6edebdddf6e63b8f
Summary:
Merge branch '2022.2' into 2022.3

# Conflicts:
#	src/main/kotlin/creator/MinecraftModuleBuilder.kt


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision aead93f8d1ea69997f4f284c2a4738c5631918eb)
+++ build.gradle.kts	(revision 92bf71d394d49d566a4ec9ce6edebdddf6e63b8f)
@@ -81,7 +81,6 @@
 
     implementation(files(gradleToolingExtensionJar))
 
-    implementation(libs.templateMakerFabric)
     implementation(libs.mappingIo)
     implementation(libs.bundles.asm)
 
@@ -156,10 +155,11 @@
         "maven",
         "gradle",
         "Groovy",
+        "Kotlin",
         "org.toml.lang:$pluginTomlVersion",
         "ByteCodeViewer",
-        // needed dependencies for unit tests
         "properties",
+        // needed dependencies for unit tests
         "junit"
     )
 
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision aead93f8d1ea69997f4f284c2a4738c5631918eb)
+++ gradle/libs.versions.toml	(revision 92bf71d394d49d566a4ec9ce6edebdddf6e63b8f)
@@ -10,7 +10,6 @@
 coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines" }
 coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 
-templateMakerFabric = "com.extracraftx.minecraft:TemplateMakerFabric:0.4.1"
 mappingIo = "net.fabricmc:mapping-io:0.2.1"
 
 # GrammarKit
Index: src/main/kotlin/util/utils.kt
===================================================================
--- src/main/kotlin/util/utils.kt	(revision aead93f8d1ea69997f4f284c2a4738c5631918eb)
+++ src/main/kotlin/util/utils.kt	(revision 92bf71d394d49d566a4ec9ce6edebdddf6e63b8f)
@@ -30,6 +30,7 @@
 import com.intellij.openapi.util.Computable
 import com.intellij.openapi.util.Condition
 import com.intellij.openapi.util.Ref
+import com.intellij.openapi.util.text.StringUtil
 import com.intellij.pom.java.LanguageLevel
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
@@ -52,31 +53,26 @@
     }
 }
 
-inline fun <T : Any?> Project.runWriteTaskInSmartMode(crossinline func: () -> T): T {
-    if (ApplicationManager.getApplication().isReadAccessAllowed) {
-        return runWriteTask { func() }
-    }
-
+inline fun Project.runWriteTaskInSmartMode(crossinline func: () -> Unit) {
     val dumbService = DumbService.getInstance(this)
-    val ref = Ref<T>()
-    while (true) {
-        dumbService.waitForSmartMode()
-        val success = runWriteTask {
+    lateinit var runnable: Runnable
+    runnable = Runnable {
-            if (isDisposed) {
-                throw ProcessCanceledException()
-            }
+        if (isDisposed) {
+            throw ProcessCanceledException()
+        }
+        runWriteTask {
+            if (isDisposed) {
+                throw ProcessCanceledException()
+            }
             if (dumbService.isDumb) {
-                return@runWriteTask false
+                dumbService.runWhenSmart(runnable)
+            } else {
+                func()
             }
-            ref.set(func())
-            return@runWriteTask true
         }
-        if (success) {
-            break
-        }
+    }
+    dumbService.runWhenSmart(runnable)
-    }
+}
-    return ref.get()
-}
 
 fun <T : Any?> invokeAndWait(func: () -> T): T {
     val ref = Ref<T>()
@@ -306,6 +302,9 @@
         .joinToString("")
 }
 
+fun String.toJavaClassName() = StringUtil.capitalizeWords(this, true)
+    .replace(" ", "").toJavaIdentifier(allowDollars = false)
+
 fun String.toPackageName(): String {
     if (this.isEmpty()) {
         return "_"