Add Kotlin DSL template

scripts/src/lib/Template.svelte

@@ -10,6 +10,7 @@
     let projectName = "Template Mod";
     let packageName = "com.example";
     let useKotlin = false;
+    let useKotlinGradle = false;
     let dataGeneration = false;
     let splitSources = true;
 
@@ -48,6 +49,7 @@
             projectName,
             packageName,
             useKotlin,
+            useKotlinGradle,
             dataGeneration: dataGeneration && supportsDataGen,
             splitSources: splitSources && supportsSplitSources,
         };
@@ -131,6 +133,17 @@
             </p>
         </div>
 
+        <div>
+            <div class="option-container">
+                <input id="kotlinGradle" type="checkbox" class="option-input" bind:checked={useKotlinGradle} />
+                <label for="kotlinGradle" class="option-label">Gradle Kotlin DSL</label>
+            </div>
+            <p class="option-body">
+                Use <a href="https://docs.gradle.org/current/userguide/kotlin_dsl.html">Gradle Kotlin DSL</a> instead of Groovy.
+                This will generate <code>build.gradle.kts</code> and <code>settings.gradle.kts</code> files.
+            </p>
+        </div>
+
         {#if supportsDataGen}
         <div>
             <div class="option-container">

scripts/src/lib/template/gradlekotlin.ts

@@ -0,0 +1,13 @@
+import type { ComputedConfiguration, TemplateWriter } from './template';
+import { renderTemplate } from './eta';
+
+import gradlePropertiesTemplate from './templates/gradle/groovy/gradle.properties.eta?raw';
+import buildGradleTemplate from './templates/gradle/kotlin/build.gradle.kts.eta?raw';
+import settingsGradle from './templates/gradle/kotlin/settings.gradle.kts?raw';
+import { getJavaVersion } from './java';
+
+export async function addKotlinGradle(writer: TemplateWriter, config: ComputedConfiguration) {
+	await writer.write('gradle.properties', renderTemplate(gradlePropertiesTemplate, config));
+	await writer.write('build.gradle.kts', renderTemplate(buildGradleTemplate, {...config, java: getJavaVersion(config.minecraftVersion)}));
+	await writer.write('settings.gradle.kts', settingsGradle);
+}

scripts/src/lib/template/template.ts

@@ -1,5 +1,6 @@
 import { addGradleWrapper } from './gradlewrapper';
 import { addGroovyGradle } from './gradlegroovy';
+import { addKotlinGradle } from './gradlekotlin';
 import { getApiVersionForMinecraft, getKotlinAdapterVersions, getLoaderVersions, getMinecraftYarnVersions } from '../Api';
 import { addModJson } from './modjson';
 import { addGitFiles } from './git';
@@ -21,6 +22,7 @@ export interface Configuration {
 	projectName: string,
 	packageName: string,
 	useKotlin: boolean,
+	useKotlinGradle: boolean,
 	dataGeneration: boolean,
 	splitSources: boolean,
 }
@@ -51,7 +53,11 @@ export async function generateTemplate(options: Options) {
 	const computedConfig = await computeConfig(options.config);
 
 	await addGradleWrapper(options);
-	await addGroovyGradle(options.writer, computedConfig);
+	if (options.config.useKotlinGradle) {
+		await addKotlinGradle(options.writer, computedConfig);
+	} else {
+		await addGroovyGradle(options.writer, computedConfig);
+	}
 	await addModJson(options.writer, computedConfig);
 	await addGitFiles(options.writer, computedConfig);
 }

scripts/src/lib/template/templates/gradle/kotlin/build.gradle.kts.eta

@@ -0,0 +1,116 @@
+plugins {
+	id("fabric-loom") version "1.0-SNAPSHOT"
+	id("maven-publish")
+	<% if (it.kotlin) { %>kotlin("jvm") version "<%= it.kotlin.kotlinVersion %>"<% } %>
+}
+
+base.archivesName.set(project.properties["archives_base_name"] as String)
+version = project.properties["mod_version"] as String
+group = project.properties["maven_group"] as String
+
+repositories {
+	// Add repositories to retrieve artifacts from in here.
+	// You should only use this when depending on other mods because
+	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+	// for more information about repositories.
+}
+<% if (it.dataGeneration || it.splitSources) { %>
+loom {
+<% if (it.splitSources) { %>	splitEnvironmentSourceSets()
+
+	mods {
+		create("modid") {
+			sourceSet(sourceSets["main"])
+			sourceSet(sourceSets["client"])
+		}
+	}    
+<% } %><% if (it.dataGeneration) { %>	runs {
+		create("datagen") {
+			inherit(runConfigs["server"])
+			name("Data Generation")
+			vmArg("-Dfabric-api.datagen")
+			vmArg("-Dfabric-api.datagen.output-dir=${file("src/main/generated")}")
+			vmArg("-Dfabric-api.datagen.modid=<%= it.modid %>")
+
+			runDir("build/datagen")
+		}
+	}<% } %>
+}
+<% } %><% if (it.dataGeneration) { %>
+sourceSets {
+	main {
+		resources {
+			srcDirs += file("src/main/generated")
+		}
+	}
+}<% } %>
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft("com.mojang:minecraft:${project.properties["minecraft_version"]}")
+	mappings("net.fabricmc:yarn:${project.properties["yarn_mappings"]}:v2")
+	modImplementation("net.fabricmc:fabric-loader:${project.properties["loader_version"]}")
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation("net.fabricmc.fabric-api:fabric-api:${project.properties["fabric_version"]}")
+<% if (it.kotlin) { %>	modImplementation("net.fabricmc:fabric-language-kotlin:${project.properties["fabric_kotlin_version"]}")<% } %>
+	// Uncomment the following line to enable the deprecated Fabric API modules. 
+	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
+
+	// modImplementation("net.fabricmc.fabric-api:fabric-api-deprecated:${project.properties["fabric_version"]}")
+}
+
+tasks {
+	processResources {
+		inputs.property("version", project.version)
+		filteringCharset = "UTF-8"
+
+		filesMatching("fabric.mod.json") {
+			expand(mapOf("version" to project.version))
+		}
+	}
+
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	val targetJavaVersion = <%= it.java.release %>
+	withType<JavaCompile> {
+		options.encoding = "UTF-8"
+		options.release.set(targetJavaVersion)
+	}
+
+<% if (it.kotlin) { %>	withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+		kotlinOptions.jvmTarget = targetJavaVersion.toString()
+	}<% } %>
+
+	java {
+		toolchain.languageVersion.set(JavaLanguageVersion.of(JavaVersion.toVersion(targetJavaVersion).toString()))
+
+		// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+		// if it is present.
+		// If you remove this line, sources will not be generated.
+		withSourcesJar()
+	}
+
+	jar {
+		from("LICENSE") {
+			rename { "${it}_${base.archivesName}" }
+		}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		create<MavenPublication>("mavenJava") {
+			from(components["java"])
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

scripts/src/lib/template/templates/gradle/kotlin/settings.gradle.kts

@@ -0,0 +1,9 @@
+pluginManagement {
+    repositories {
+        maven("https://maven.fabricmc.net/") {
+            name= "Fabric"
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}