From aaaf2751892169f8b92b4e91c905e6910db7693e Mon Sep 17 00:00:00 2001
From: KrLite <68179735+KrLite@users.noreply.github.com>
Date: Sat, 24 Feb 2024 18:45:16 +0800
Subject: [PATCH] kts

---
 build.gradle                           | 54 ------------------------
 build.gradle.kts                       | 58 ++++++++++++++++++++++++++
 gradle.properties                      | 14 -------
 gradle/libs.versions.toml              | 22 ++++++++++
 settings.gradle => settings.gradle.kts |  4 +-
 5 files changed, 82 insertions(+), 70 deletions(-)
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 delete mode 100644 gradle.properties
 create mode 100644 gradle/libs.versions.toml
 rename settings.gradle => settings.gradle.kts (60%)

diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 71429a8..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,54 +0,0 @@
-plugins {
-	id 'fabric-loom' version '1.5-SNAPSHOT'
-	id 'maven-publish'
-}
-
-archivesBaseName = "${project.archives_base_name}-${project.minecraft_version}"
-version = project.mod_version
-group = project.maven_group
-
-repositories {
-}
-
-dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-}
-
-processResources {
-	inputs.property "version", project.version
-
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-	it.options.release = Integer.parseInt(sourceCompatibility)
-}
-
-java {
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
-
-	withSourcesJar()
-}
-
-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
-}
-
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			from components.java
-		}
-	}
-
-	repositories {
-	}
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..2ef9431
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,58 @@
+plugins {
+	base
+	java
+	idea
+	`maven-publish`
+	alias(libs.plugins.fabric.loom)
+}
+
+group = libs.versions.maven.group.get()
+version = "${libs.versions.minecraft.get()}-${libs.versions.mod.get()}"
+
+base {
+	archivesName.set(libs.versions.archives.name)
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	minecraft(libs.minecraft)
+	mappings(libs.yarn)
+	modImplementation(libs.bundles.fabric)
+}
+
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+
+	withSourcesJar()
+}
+
+tasks {
+	processResources {
+		inputs.property("version", libs.versions.mod.get())
+
+		filesMatching("fabric.mod.json") {
+			expand(mapOf("version" to libs.versions.mod.get()))
+		}
+	}
+
+	jar {
+		from("LICENSE") {
+			rename { "${it}_${base.archivesName}" }
+		}
+	}
+}
+
+publishing {
+	publications {
+		create<MavenPublication>("mavenJava") {
+			from(components["java"])
+		}
+	}
+
+	repositories {
+	}
+}
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 3e6e23e..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-org.gradle.jvmargs = -Xmx1G
-org.gradle.parallel = true
-
-# https://fabricmc.net/develop
-minecraft_version = 1.20
-yarn_mappings = 1.20+build.1
-loader_version = 0.15.3
-
-mod_version = 3.1.1
-maven_group = net.krlite
-archives_base_name = taptab
-
-# Dependencies
-fabric_version = 0.83.0+1.20
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..72bd523
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,22 @@
+[versions]
+maven-group = "net.krlite"
+archives-name = "taptab"
+mod = "3.2.0"
+
+minecraft = "1.20"
+yarn = "1.20+build.1"
+fabric-loader = "0.15.7"
+fabric-api = "0.83.0+1.20"
+fabric-loom = "1.5-SNAPSHOT"
+
+[libraries]
+minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
+yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
+fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" }
+fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" }
+
+[plugins]
+fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
+
+[bundles]
+fabric = ["fabric-loader", "fabric-api"]
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 60%
rename from settings.gradle
rename to settings.gradle.kts
index b02216b..a7f3f56 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
         maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
+            name = "Fabric"
+            url = uri("https://maven.fabricmc.net/")
         }
         mavenCentral()
         gradlePluginPortal()