User: kyle wood
Date: 04 Aug 24 03:07
Revision: 87677a67bfeed7d29e371cc47b6a8fdbef0fa7cb
Summary:
Merge branch '2023.3' into 2024.1


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 9a0d413ab32c2eab87209c86dbbdb1848d6947f4)
+++ build.gradle.kts	(revision 87677a67bfeed7d29e371cc47b6a8fdbef0fa7cb)
@@ -118,7 +118,6 @@
 
     implementation(libs.mixinExtras.expressions)
     testLibs(libs.mixinExtras.common)
-    implementation("org.ow2.asm:asm-util:9.3")
 
     // Kotlin
     implementation(kotlin("stdlib-jdk8"))
@@ -298,11 +297,10 @@
 tasks.test {
     dependsOn(tasks.jar, testLibs)
     useJUnitPlatform()
-    doFirst {
+
-        testLibs.resolvedConfiguration.resolvedArtifacts.forEach {
-            systemProperty("testLibs.${it.name}", it.file.absolutePath)
-        }
+    testLibs.resolvedConfiguration.resolvedArtifacts.forEach {
+        systemProperty("testLibs.${it.name}", it.file.absolutePath)
+    }
-    }
     systemProperty("NO_FS_ROOTS_ACCESS_CHECK", "true")
     systemProperty("java.awt.headless", "true")
 
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 9a0d413ab32c2eab87209c86dbbdb1848d6947f4)
+++ gradle/libs.versions.toml	(revision 87677a67bfeed7d29e371cc47b6a8fdbef0fa7cb)
@@ -26,6 +26,7 @@
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
 asm-analysis = { module = "org.ow2.asm:asm-analysis", version.ref = "asm" }
+asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
 
 fuel = { module = "com.github.kittinunf.fuel:fuel", version.ref = "fuel" }
 fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", version.ref = "fuel" }
@@ -45,5 +46,5 @@
 
 [bundles]
 coroutines = ["coroutines-swing"]
-asm = ["asm", "asm-tree", "asm-analysis"]
+asm = ["asm", "asm-tree", "asm-analysis", "asm-util"]
 fuel = ["fuel", "fuel-coroutines"]
Index: src/main/kotlin/creator/custom/providers/TemplateProvider.kt
===================================================================
--- src/main/kotlin/creator/custom/providers/TemplateProvider.kt	(revision 9a0d413ab32c2eab87209c86dbbdb1848d6947f4)
+++ src/main/kotlin/creator/custom/providers/TemplateProvider.kt	(revision 87677a67bfeed7d29e371cc47b6a8fdbef0fa7cb)
@@ -57,9 +57,9 @@
 
     val hasConfig: Boolean
 
-    fun init(indicator: ProgressIndicator, repos: List<MinecraftSettings.TemplateRepo>) = Unit
+    suspend fun init(indicator: ProgressIndicator, repos: List<MinecraftSettings.TemplateRepo>) = Unit
 
-    fun loadTemplates(context: WizardContext, repo: MinecraftSettings.TemplateRepo): Collection<LoadedTemplate>
+    suspend fun loadTemplates(context: WizardContext, repo: MinecraftSettings.TemplateRepo): Collection<LoadedTemplate>
 
     fun setupConfigUi(data: String, dataSetter: (String) -> Unit): JComponent?