Use reified generics instead of java classes

Author: MsRandom

minecraft-codev-core/gradle.properties

@@ -1 +1 @@
-version=0.6.3
+version=0.6.4

minecraft-codev-core/src/main/kotlin/net/msrandom/minecraftcodev/core/ResolutionRule.kt

@@ -3,6 +3,7 @@ package net.msrandom.minecraftcodev.core
 import net.msrandom.minecraftcodev.core.utils.zipFileSystem
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
+import org.gradle.kotlin.dsl.listProperty
 import java.nio.file.FileSystem
 import java.nio.file.Path
 
@@ -62,13 +63,13 @@ abstract class ZipResolutionRuleHandler<T : ResolutionData<*>, U : ZipResolution
 
 @Suppress("UNCHECKED_CAST")
 fun <T : ResolutionData<*>> ObjectFactory.zipResolutionRules() =
-    listProperty(ZipResolutionRule::class.java) as ListProperty<ZipResolutionRule<T>>
+    listProperty<ZipResolutionRule<T>>()
 
 @Suppress("UNCHECKED_CAST")
 fun <T : ResolutionData<*>> ObjectFactory.resolutionRules(
     zipResolutionRules: ListProperty<ZipResolutionRule<T>>,
 ): ListProperty<ResolutionRule<T>> {
-    val rules = listProperty(ResolutionRule::class.java) as ListProperty<ResolutionRule<T>>
+    val rules = listProperty<ResolutionRule<T>>()
 
     rules.add { path, extension, data ->
         handleZipRules(zipResolutionRules.get(), path, extension, data)

minecraft-codev-fabric/gradle.properties

@@ -1 +1 @@
-version=0.6.8
+version=0.6.9

minecraft-codev-fabric/src/main/kotlin/net/msrandom/minecraftcodev/fabric/runs/FabricRunsIntegration.kt

@@ -6,9 +6,10 @@ import net.msrandom.minecraftcodev.runs.RunConfigurationDefaultsContainer
 import net.msrandom.minecraftcodev.runs.RunsContainer
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.withType
 
 fun Project.setupFabricRunsIntegration() {
-    plugins.withType(MinecraftCodevRunsPlugin::class.java) {
+    plugins.withType<MinecraftCodevRunsPlugin<*>> {
         val defaults = extension<RunsContainer>().extension<RunConfigurationDefaultsContainer>()
 
         defaults.extensions.create("fabric", FabricRunsDefaultsContainer::class, defaults)

minecraft-codev-forge/gradle.properties

@@ -1 +1 @@
-version=0.6.7
+version=0.6.8

minecraft-codev-forge/src/main/kotlin/net/msrandom/minecraftcodev/forge/runs/ForgeRunsDefaultsContainer.kt

@@ -24,6 +24,8 @@ import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
+import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.mapProperty
 import org.gradle.kotlin.dsl.newInstance
 import java.io.File
 import kotlin.io.path.readText
@@ -155,7 +157,7 @@ open class ForgeRunsDefaultsContainer(
         }
 
         beforeRun.addAll(configProvider.flatMap {
-            val list = project.objects.listProperty(Task::class.java)
+            val list = project.objects.listProperty<Task>()
 
             val hasAssets = it.getRun().args.contains("{assets_root}") ||
                     it.getRun().env.containsValue("{assets_root}")
@@ -202,7 +204,7 @@ open class ForgeRunsDefaultsContainer(
 
         environment.putAll(
             zipped.flatMap { (manifest, userdevConfig) ->
-                project.objects.mapProperty(String::class.java, String::class.java).apply {
+                project.objects.mapProperty<String, String>().apply {
                     for ((key, value) in userdevConfig.getRun().env) {
                         val argument =
                             if (value.startsWith('$')) {

minecraft-codev-forge/src/main/kotlin/net/msrandom/minecraftcodev/forge/runs/setupForgeRunsIntegration.kt

@@ -6,9 +6,10 @@ import net.msrandom.minecraftcodev.runs.RunConfigurationDefaultsContainer
 import net.msrandom.minecraftcodev.runs.RunsContainer
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.withType
 
 internal fun Project.setupForgeRunsIntegration() {
-    plugins.withType(MinecraftCodevRunsPlugin::class.java) {
+    plugins.withType<MinecraftCodevRunsPlugin<*>>() {
         val defaults = extension<RunsContainer>().extension<RunConfigurationDefaultsContainer>()
 
         defaults.extensions.create("forge", ForgeRunsDefaultsContainer::class, defaults)

minecraft-codev-runs/gradle.properties

@@ -1 +1 @@
-version=0.6.6
+version=0.6.7

minecraft-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftRunConfiguration.kt

@@ -16,6 +16,7 @@ import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
+import org.gradle.kotlin.dsl.listProperty
 import org.gradle.kotlin.dsl.register
 import java.io.File
 import java.nio.file.Path
@@ -216,7 +217,7 @@ abstract class MinecraftRunConfiguration @Inject constructor(private val name: S
     }
 
     fun compileArguments(arguments: Iterable<Any?>): ListProperty<String> =
-        project.objects.listProperty(String::class.java).apply {
+        project.objects.listProperty<String>().apply {
             for (argument in arguments) {
                 if (argument is Provider<*>) {
                     add(argument.map(::mapArgumentPart))

minecraft-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/RunConfigurationDefaultsContainer.kt

@@ -16,6 +16,7 @@ import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.Optional
+import org.gradle.kotlin.dsl.named
 import java.util.jar.Attributes
 import java.util.jar.JarFile
 import java.util.jar.Manifest
@@ -33,12 +34,12 @@ abstract class RunConfigurationDefaultsContainer : ExtensionAware {
 
             val extractNativesTask =
                 sourceSet.flatMap {
-                    project.tasks.named(it.extractNativesTaskName, ExtractNatives::class.java)
+                    project.tasks.named<ExtractNatives>(it.extractNativesTaskName)
                 }
 
             val downloadAssetsTask =
                 sourceSet.flatMap {
-                    project.tasks.named(it.downloadAssetsTaskName, DownloadAssets::class.java)
+                    project.tasks.named<DownloadAssets>(it.downloadAssetsTaskName)
                 }
 
             beforeRun.add(extractNativesTask)